[automerger skipped] Merge changes from topic "am-c6168f81c15b4bdc8b95f05dbf2b9ba8" into rvc-d1-dev-plus-aosp am: 3c23410f09 -s ours am: f326d9de7b -s ours
am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 9644bc01dd is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887
Change-Id: If5412dd79954536f3b2d903ff0e3d5eaa40f35b1
This commit is contained in: