Merge changes from topic "am-3fb17e9a763546429c67d547e31aea06" into tm-qpr-dev am: f008c5bb

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



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