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

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

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



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