Merge changes from topic "am-ec9909332fce4d5bbaa869bb48b9491b" into...

Merge changes from topic "am-ec9909332fce4d5bbaa869bb48b9491b" into tm-d1-dev-plus-aosp am: 25fb5cd7 am: c41d02b4

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



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