Merge changes from topic "am-5caaab458c8b4d75ba15bc6d39286d23" into...

Merge changes from topic "am-5caaab458c8b4d75ba15bc6d39286d23" into tm-qpr-dev-plus-aosp am: 3001db8f

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



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