Merge changes from topic "am-a0be7ec82e864d0583f1902a6a6f6a91" into tm-qpr-dev am: 1204dd86 am: 8f1a8050

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



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