Merge "Address [set|get]RestrictedAllowedApps API review feedback" am: 16c34f0d8b

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

Change-Id: I0c9966c379e956fbf8a01d81d5f1dd0e68662763