Merge changes from topic "preinstall-overrides" am: 29ed176b46

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I916e47454ada9ffe6b0eba017807baa8d904ea44