[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 647c3191 -s ours am: e36fb6e5 -s ours

am skip reason: Merged-In I2d525d59c24df63429ef090e41e45952506c1c59 with SHA-1 718fd088 is already in history

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



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