tree 8dd94dcb5a1ab53b3ae372bd56e70f2f01ac78c4
parent 57f2f3fedd994666d461e928f79170fa729797e4
parent 282a2a51b49f1e363a21bddeb8ab9ef75aa2946b
author Eugene Susla <eugenesusla@google.com> 1612310750 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612310750 +0000

[automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours am: 56cc3b82c2 am: 175d275bb9 -s ours am: 282a2a51b4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5079f83997888461885535de398d57357d76341d