Merge changes from topic "am-f61de8f6c2944168b91c372e1e326472" into...

Merge changes from topic "am-f61de8f6c2944168b91c372e1e326472" into tm-qpr-dev-plus-aosp am: 5e920dd0

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



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