Merge "Add RESTRICTED_ALLOWED_APPS setting" am: e6d2b4663e am: fe7e35ea07 am: 67909cbb05

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

Change-Id: I59c9ff9a64eac6b3367169450ca2c063ef34ff3c