Merge changes from topic "am-f84f92b539a04047959e42e80b6a8093" into...

Merge changes from topic "am-f84f92b539a04047959e42e80b6a8093" into tm-qpr-dev-plus-aosp am: e9e322a3 -s ours

am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 468dd54e is already in history

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



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