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

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

Change-Id: Iedd6429e956f77ba595f5dd6029c48a487ddbf0c