[automerger skipped] DO NOT MERGE am: 0b672c0a5f -s ours
am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 01f65561df is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23174497
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23452997
Change-Id: I59bdb4c82814a536a4299431d7ae7785be89c758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: