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

[automerger skipped] Merge "Only autoVerify at install for new hosts" into oc-mr1-dev am: 178b57c5 am: e4b7d4c8 am: 3214fcfb am: 42c911a8 -s ours am: c9c3789d -s ours am: 26a82655 -s ours am: bd38fd22 -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/+/11692559

Change-Id: Ib9d0208f4aaa484b8f305740c405951eeda00577