[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 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: Ic800569e317dc218fd4c5a70a5fafd687c0a33b3