[automerger skipped] DO NOT MERGE am: a31fad61 -s ours

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

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

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



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