Merge changes from topic "am-65ec7e5cefea42f8b3e09e32d8777d11" into main

* changes:
  [automerger skipped] Merge "Restore trimMemory behaviour from T" into udc-dev am: 90c9dbf7b9 am: 390a7f1374 -s ours
  [automerger skipped] Merge "Unregister mShowWeatherObserver when KeyguardClockSwitchController is detached" into udc-dev am: fe4e586e2e am: b2f8e18df2 -s ours