[automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a442 am: c41fdb42a4 -s ours am: d6765ff93c -s ours am: 974929a9b1 -s ours am: 1f14278834 am: 53aea4a3ad -s ours am: 4780dc3cb3 -s ours am: 12dc02e15b -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: I0f000b270d593fc3f2f81b639db73e19cdea30be