Merge changes from topic "am-38eae739df6b4af0ac5f91bbe684b61d" into...

Merge changes from topic "am-38eae739df6b4af0ac5f91bbe684b61d" into tm-d1-dev-plus-aosp am: 01bc7d99 am: 1b39510a

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



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