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

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

Change-Id: I6cd26b7a1e1630de6b2ae15ad1dff8959334859d