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

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

Change-Id: Ic3d3b6fd63f7f045ee877dd82f3bcdc963a3206e