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

Merge changes from topic "am-fccad1fd78d74820ac27310bf754500a" into tm-d1-dev-plus-aosp am: 0ea49d41 am: f331d2e5

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



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