[automerger skipped] Merge "Fix the case where restricted mode allowed reasons...

[automerger skipped] Merge "Fix the case where restricted mode allowed reasons are ignored" into sc-v2-dev am: ff733363 -s ours am: d880ce86 -s ours

am skip reason: Merged-In I5e616fd1e9a916ad9a367b4391c85c1febbf1f6b with SHA-1 0b4cafda is already in history

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

Change-Id: Iedc5bca4b71682e27646cc6ed52ee8dc6b469cbe