[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 4720606b02 -s ours am: e7a3528bbf -s ours am: 4cb28f9cc1 -s ours

am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 d33028c205 is in history

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

Change-Id: I24f4975c818a6857feee0082245bfb33af3911ff
This commit is contained in:
Lorenzo Colitti
2020-06-10 16:01:56 +00:00
committed by Automerger Merge Worker

Diff Content Not Available