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

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

Change-Id: I2b11393ca658db069262c8a20ccfdd12116b336b