Merge "Apply app ops restriction and filter to restricted switch preference" into tm-dev am: 477ed8b6 am: 1c59bb5f

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

Change-Id: I99b48c17c4c6d977000406d026ec71b9012004e2