[automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new...

[automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 1747090b am: ee631a72 -s ours am: 3bc3d3e0 -s ours am: d1027116 -s ours am: 62970529 am: 2f50ed96 -s ours am: 75a8d303 -s ours am: 9cb0c58f -s ours am: 63491786 -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/+/11689886

Change-Id: I1fbf38030cc05c0b5f732f6c45a4894bda719789