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

Change-Id: I8d5d3b844a0291a12191c15af03c1da388ab4ef9