Merge changes from topic "am-93f41d43c5f04f2d8fcb73fe0e564d13" into...

Merge changes from topic "am-93f41d43c5f04f2d8fcb73fe0e564d13" into tm-d1-dev-plus-aosp am: 691a76d0 -s ours

am skip reason: Merged-In Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe with SHA-1 1325574d is already in history

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



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