[conflict] Merge changes I3af271d0,I46df1c8b,I1eb116e4,I492bfc97 am:...

[conflict] Merge changes I3af271d0,I46df1c8b,I1eb116e4,I492bfc97 am: fb15a05e am: 180ed70a am: aec33bc0

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



Bug: 272097507
Test: resolve merge conflict
Change-Id: Ib28e632e1bdeebad98e2a2047aec36454e8a7ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>