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

Merge changes from topic "am-e9f54b7e2b304d1f9ba6a80b494b4f9b" into tm-qpr-dev-plus-aosp am: e35cea7c

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



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