[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 am: 2f50ed96f0 -s ours am: 75a8d3033e -s ours am: 9cb0c58fb0 -s ours

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

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

Change-Id: Iae9016dc308f2d848a31044b75a24b95a5bedfd6