Update to Memfault SDK 1.6.1

Required rebasing the sdk-nrf fork branch, because the
`fota_download_any()` API is present in the 2.5.99 upstream `main`, to
be released in 2.6.0, and the version check assumes 2.5.99==2.6.0. We
only in practice support real NCS releases.

overlay-memfault.conf

@@ -42,7 +42,3 @@ CONFIG_MEMFAULT_FOTA=y
 
 CONFIG_MEMFAULT_NCS_FW_VERSION_STATIC=y
 CONFIG_MEMFAULT_NCS_FW_VERSION="0.0.99-dev"
-
-# TODO: Remove after disabling just the self-test
-# Disable shell to save space
-CONFIG_MEMFAULT_SHELL=n

west.yml

@@ -11,13 +11,13 @@ manifest:
       # TODO: Remove url and revision when this is no
       # longer needed
       url: https://github.com/memfault/sdk-nrf.git
-      revision: gminn/v2.5.99-lte-metrics
+      revision: noahp/v2.5.99-lte-metrics-upmerge # gminn/v2.5.99-lte-metrics
       import: true
 
     - name: memfault-firmware-sdk
       url: https://github.com/memfault/memfault-firmware-sdk
       path: modules/lib/memfault-firmware-sdk
-      revision: "1.6.0"
+      revision: "1.6.1"
 
   self:
     path: firmware