Merge "Set app-op for restricted pre-22 apps" into qt-dev
am: 26a896ecc8

Change-Id: I4d6c596e255ca418abac2092b27eb6d57a4e9781