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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94c9aca60ff8d5eec190434a2a22338cb04d5922