tree 8f4cab55517362faedad66c4ee3396f8b5161259
parent b463014633df0477fa9c285641b2012b6b978424
parent 1138d178c4b38a725d3ccbab835168ff61e5d808
author Bill Yi <byi@google.com> 1600494636 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600494636 +0000

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 725af62a59 am: 1138d178c4 -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: I4a14d0f2ef305f4f564e7e38134763a85fd09ad3