[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: e5c2aeb2 -s ours am: 263461d1 -s ours

am skip reason: Merged-In Ie0ca41247b80f927ef1377866d1a2d2d2deb5333 with SHA-1 9ff47bcb is already in history

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



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