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

Change-Id: Ifb786a559d2a67451a08d6bd6582698da18cb81d