tree 157917073f9d0be6b1e692d6c130dc26f88f60a4
parent fd06cdb5af75c4bcebdf3ff9e1189e3b581e39ae
parent 3c24d07dfb15d0d1e9697119a9d17f45808a7d6c
author Eugene Susla <eugenesusla@google.com> 1612915551 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612915551 +0000

[automerger skipped] RESTRICT AUTOMERGE am: 30e9d28c22 am: 4d587c5aa9 -s ours am: 3c24d07dfb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2efca3a5747ef31742a85f70ff483087da6c9d3