Merge changes from topic "am-1b5ff54850484f67a65c2bda86eb0cf0" into tm-qpr-dev-plus-aosp am: 12cf8bf1

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



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