Merge changes from topic "am-e8aa8ce2cbf5496787d2514c0ff8c940" into tm-qpr-dev am: 05c4cbd7

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



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