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

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

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



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