Merge changes from topic "am-08081044857e45519703fa87156f2ce7" into main

* changes:
  [automerger skipped] Merge "Restore trimMemory behaviour from T" into udc-dev am: 90c9dbf7 am: 2a6a20b6 am: 64577a4a -s ours am: 89b32bf5 -s ours
  [automerger skipped] Merge "Unregister mShowWeatherObserver when KeyguardClockSwitchController is detached" into udc-dev am: fe4e586e am: 18ffecda am: 25223079 -s ours am: 53f8dcf3 -s ours