Merge changes from topic "am-5957a03bf0504f629c936f15d20b4378" into tm-qpr-dev-plus-aosp am: d6e2e2fe

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



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