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

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

Change-Id: I950022906886f40a1fb830cc904570ac774254de