Merge changes from topic "apex-installers-restriction" into sc-dev am: e8b12935 am: 16627833 am: b748adbe

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

Change-Id: I31d9a03d4b1ece7c4c8525d3c101784699b3ba13