[automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a4 am: c41fdb42 -s ours

am skip reason: Change-Id Ibaf087946966ad82d60c7b255e3ee75990716b63 with SHA-1 153de338 is in history

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

Change-Id: I225e1f57ca119c4483ef947b6f4d2343a335405a