[automerger skipped] Merge "Only autoVerify at install for new hosts" into...

[automerger skipped] Merge "Only autoVerify at install for new hosts" into pi-dev am: 417f48f0 -s ours am: 0e78a7b1 am: 3f92d057 -s ours am: b722c3b3 -s ours am: 0bba18e6 -s ours am: d8fcda72 -s ours am: d35c6d96 -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/+/11694357

Change-Id: Ie2ebc302cb6c3fa507e671e8772fcaea94eb17ee