Merge changes from topic "am-5d7065a4938b4f6ab81634c1412ce0c4" into tm-qpr-dev-plus-aosp am: 1407a640

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



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