Merge changes from topic "am-1a639eaa84504a15988bb274c4f563e8" into...

Merge changes from topic "am-1a639eaa84504a15988bb274c4f563e8" into tm-qpr-dev-plus-aosp am: 46dd7097

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



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