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

Change-Id: I3190ca1b205348c6f13db526fd474f071a08aa55