Merge changes from topic "am-a0ba1daf19774c3f9fba6166cd4db058" into main

* changes:
  [automerger skipped] Merge "Restore trimMemory behaviour from T" into udc-dev am: 90c9dbf7 am: 2a6a20b6 -s ours am: cf5dcd36 -s ours am: ce5e7d23 -s ours
  [automerger skipped] Merge "Unregister mShowWeatherObserver when KeyguardClockSwitchController is detached" into udc-dev am: fe4e586e am: 18ffecda -s ours am: a86923e5 -s ours am: eda1d7ca -s ours