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

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

Change-Id: I9658eb42381af2f00aaf2a6090d80f8aca32d5a3