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

Merge changes from topic "am-f1f0777dd35b4d0b883d9a4fe3b359b4" into tm-d1-dev-plus-aosp am: d2b660e2 -s ours

am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be991 is already in history. Merged-In was found from reverted change.

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

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



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