Merge changes from topic "apex-installers-restriction" into sc-dev am: e8b129351c am: 6fc998c833 am: 98c6fe9bbc

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

Change-Id: Ic8ae8c59da052bfac7a99007d159d90e0e7e5c74