Merge changes from topic "am-b9bb3c40c61b4cbba1e851ec557ba733" into tm-dev

* changes:
  [automerger skipped] DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being out of sync am: b373fd8f77 -s ours am: 896ebd206d -s ours am: 0cea70635a -s ours
  [automerger skipped] [DO NOT MERGE] Fix regression for enter PIP when onUserLeaveHint am: 15bcf9d7bd -s ours am: 602807d6fc -s ours am: fe3ce66c35 -s ours
  [automerger skipped] Dispose of input event reciever along with monitor am: 12464ec4c1 -s ours am: b771341b38 -s ours am: 828572e4a6 -s ours
  [automerger skipped] Fix missing group alertOverride recalculation am: 2592ea1fc8 -s ours am: f835a0f611 -s ours am: d22b3004a7 -s ours
  [automerger skipped] Allow alertOverride if the summary GROUP_ALERT_ALL am: bdd4019a16 -s ours am: 748ea85cd7 -s ours am: ffc616ebc7 -s ours
  [automerger skipped] Fix the animation glitch when NSSL adds and removes a HUN in the same frame. am: 5d54f3c761 -s ours am: ee21aec75c -s ours am: 0ab1d05471 -s ours
  [automerger skipped] Check that PowerManager#isInteractive is false before showing the AOD UI for screen off. am: e0d326d3fd -s ours am: 3bd60e237f -s ours am: f25e88f56f -s ours
  [automerger skipped] *ServiceStartNotAllowedException shouldn't have a "cause" am: 90819feb5a -s ours am: eff9d12959 -s ours am: 143a63ab35 -s ours
  [automerger skipped] Allow extra keyguard logs to be enabled via adb am: 2dcb5a8188 -s ours am: e762c8aa16 -s ours am: 83cb2ab579 -s ours
  [automerger skipped] Revert "Notify display brightness changed due to brightness transforms" am: 74bbae3074 -s ours am: 0c66bc0a76 -s ours am: 1aa375d4da -s ours
  [automerger skipped] PiP: Disable enterSplit for now. am: 5c107b0b59 -s ours am: 62781a32ac -s ours am: 2261c925c2 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am: 6e1571579e -s ours am: bca2239358 -s ours am: 2bb2716af2 -s ours
  [automerger skipped] Letterbox apps in multi-window if resizeable only due to supportsPictureInPicture. am: 417fd4d17e -s ours am: 42583f7b5d -s ours am: 1ca6f4f654 -s ours
  [automerger skipped] Fix IME flicker by dispatching unrelated insets after unset IME frozen am: 83c396e9e7 -s ours am: 6e71f53538 -s ours am: ce8e2c981d -s ours
  [automerger skipped] Revert "Decode the input of both setStream and setResource calls first" am: ade248a9bc -s ours am: c0a140331a -s ours am: 4f78bcb2d8 -s ours
  [automerger skipped] Enable nested scrolling for locale picker am: 589f88b9a9 -s ours am: b4b6c7d23d -s ours am: 3d32aa68e1 -s ours
  [automerger skipped] Change window type of Media Projection dialog am: e86dacf6ea -s ours am: bc7d85a84e -s ours am: d57d62b908 -s ours
  [automerger skipped] Fix leakage of DisplayContent referenced from TransitionController am: 6c04f9b6da -s ours am: 732bbb2021 -s ours am: d751bca5b0 -s ours
  [automerger skipped] [Provider Model] Fix the overlap when changing the font/display size am: 941c4a4af0 -s ours am: f293ba954d -s ours am: 1b39709d94 -s ours

This commit is contained in:

Automerger Merge Worker

2022-03-09 10:34:11 +00:00

committed by

Android (Google) Code Review

parent 31fc5489fd 379fbb3e22

commit 5721ce81aa

Merge changes from topic "am-b9bb3c40c61b4cbba1e851ec557ba733" into tm-dev

Diff Content Not Available