Merge changes from topic "am-cea4b7e536bc41369ce4cf11b0c79cd7" into tm-qpr-dev-plus-aosp am: cd6029b2

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



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