Merge changes from topic "am-bfee83ed80e040c18ec82f23167a587c" into tm-qpr-dev-plus-aosp am: 43b77b59

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



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