[automerger skipped] Merge changes from topic "install-hints" am: 21b065b6 am: 543fdab6 am: 75064490 -s ours

am skip reason: Change-Id Iab34d79cbbc4fb0d88946ef38a1edcca16cd3a29 with SHA-1 c37a01fe is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb0ca1e925731a1da5905ace46f4a09e552ec824