Merge changes from topic "am-5323428eac01445b886bbe9c0ea39bd9" into...

Merge changes from topic "am-5323428eac01445b886bbe9c0ea39bd9" into tm-d1-dev-plus-aosp am: 39fb6b85 am: b078815c

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



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