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

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

Change-Id: I9a30162499954c4ec3bcd97233256f973662f7ab