tree bdcd5bb2359471196547b1abc7f8335e7016870a
parent d6f4a2dd2740b3cdd610adc90ae3b485ea1cc56b
parent ca804e468c64ef5caf9983df9184e9fde0f84455
author Varun Shah <varunshah@google.com> 1606958473 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606958473 +0000

[automerger skipped] RESTRICT AUTOMERGE am: e05538421f am: 28921fe615 -s ours am: 9ab0bce3e8 am: ca804e468c

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

Change-Id: I76ffdee354a251e916ece6daa6b0daaca8589ba6