tree 8f4cab55517362faedad66c4ee3396f8b5161259
parent 19984fcbf0e662e50fad375060288f9487fb8bee
parent 90ba8b743ee2c879ce80d9b8c0d8d258604e8202
author Bill Yi <byi@google.com> 1600502520 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600502520 +0000

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 8c7f330e7a am: 6dbeee66e9 -s ours am: e1d6cd570c -s ours am: 90ba8b743e -s ours

am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: I908bcb9330b0e2cf00374276e1d8e5fa3fc67fab