Merge "Fix the case where restricted mode allowed reasons are ignored" am: e07b665eec am: bfe9b8a9f3

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

Change-Id: I2e21dfbefaa9c98b7001c513998fcf808a52d1f3