tree 8ce93bbe4941b4b811b4c18c6922e236a2f09b23
parent 90eabb1afb42490e33a66c39d5ced1e9cddc7c31
parent ebe91344a0fc7a9443ea6ecfbfa82932f8d87c31
author Bill Yi <byi@google.com> 1600201935 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600201935 +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: 509872d525 -s ours am: ebe91344a0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1713ac8976730a0e6a414cf0e761f7f0267cf51e