Merge changes from topic "am-74b4885ebe3c49aea524226e5bda8731" into...

Merge changes from topic "am-74b4885ebe3c49aea524226e5bda8731" into tm-qpr-dev-plus-aosp am: 436a274c -s ours

am skip reason: Merged-In Idf5a339a5fb0ffd510e7fda0e3784916c8505eae with SHA-1 1c36dbb3 is already in history

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



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