Merge changes from topic "am-085dea5a824d4714a317e3fe17b02ff8" into tm-qpr-dev-plus-aosp am: e9369cb7

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



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