[automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 1747090bf8 am: ee631a72c3 -s ours am: 3bc3d3e0a3 -s ours am: d1027116ca -s ours am: 629705299c

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

Change-Id: I82e80214c7824764a5c195b7907ec6f24ab7a774