Merge changes from topic "am-81b816d764be456196dc3683833c1a2a" into tm-qpr-dev...

Merge changes from topic "am-81b816d764be456196dc3683833c1a2a" into tm-qpr-dev am: 8f6b36a3 -s ours

am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 b8c4819e is already in history

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



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