Merge changes from topic "am-a6b9c4dd18154c4192217c7aa1a56461" into...

Merge changes from topic "am-a6b9c4dd18154c4192217c7aa1a56461" into tm-qpr-dev-plus-aosp am: ab6ac4eb

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



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