Merge changes from topic "am-a26d4788313d423cacae551c3787555e" into tm-qpr-dev-plus-aosp am: 708aafe8

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



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