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

Change-Id: I7b15ddd86c10f89f88b52f147742f05f10193d5b