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

Merge changes from topic "am-0e604f7122244b4ab6443a3b18c387ae" into tm-d1-dev-plus-aosp am: 523e4355 -s ours

am skip reason: Merged-In I76208722bbb7a407ba1f2dc4305a28226166414d with SHA-1 c97296e9 is already in history

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



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