Merge changes from topic "am-599cbaad1a6e4dbea89840bd93cf8505" into...

Merge changes from topic "am-599cbaad1a6e4dbea89840bd93cf8505" into tm-qpr-dev-plus-aosp am: a259c3e3

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



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