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

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



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