Merge changes from topic "am-8706eed2db7742ddaa28a0099287ea89" into...

Merge changes from topic "am-8706eed2db7742ddaa28a0099287ea89" into tm-qpr-dev-plus-aosp am: 06ceab96

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



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