Merge changes from topic "am-28c2e2bbce384832a48243801699a27b" into...

Merge changes from topic "am-28c2e2bbce384832a48243801699a27b" into tm-dev-plus-aosp am: 4834ab2e -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/+/19537069



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