tree ad35f252909e68aa9dfd8e929d0f679b3db276f0
parent d0d979b03208108ccf3a150f70afac5a90cc404a
parent 38436142ff29b3f8c1f59ee0597b873298814c0b
author Bill Yi <byi@google.com> 1600120256 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600120256 +0000

[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 38436142ff -s ours

am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

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

Change-Id: I0fe501d77d176eb43d9e308e7fe3e01c579f22bb