Merge "Address [set|get]RestrictedAllowedApps API review feedback" am: f9dc4b0f52 am: bdf47a1733 am: cba89e7880

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

Change-Id: Ia8e395132226d23fdfb8cd4c93c004c459386104