[automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts...

[automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a4 am: c41fdb42 -s ours am: d6765ff9 -s ours am: 974929a9 -s ours am: 1f142788 am: 53aea4a3 -s ours am: 4780dc3c -s ours

am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc is in history

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

Change-Id: Ic81bee15d0c66e92285d247f7b090eba9edb106a