[automerger skipped] Merge changes Id8de5f90,Ifd046909 into main am: 84a106273c am: 06f704f566 am: 8462bd0853 am: e75407be1e am: b1539a5174 -s ours

am skip reason: Merged-In Id8de5f90d06647e020800aabf28bc67658dda331 with SHA-1 9a5311b495 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2736477

Change-Id: Ib6d1fa9d9983367e6426c223cdea9e3a8696344e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>