Merge changes from topic "am-0ecbc14e601042e39f68e41aaa57c1fd" into...

Merge changes from topic "am-0ecbc14e601042e39f68e41aaa57c1fd" into tm-d1-dev-plus-aosp am: 0aaa8573 -s ours

am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 aa14df0e is already in history

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



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