Merge "Maintain 'other' perm expansion across 'show system' toggles" into sc-dev am: 2794557bb2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/15074413

Change-Id: I369424da01c2ca948e8f3151d82aa34bf352a73c