Merge changes from topic "am-282315e63a6c45dd91fff7130cffc35b" into...

Merge changes from topic "am-282315e63a6c45dd91fff7130cffc35b" into tm-qpr-dev-plus-aosp am: a075832f

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



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