Merge "Merge "Make loc bg perm restricted" into qt-dev am: fedd2455 am: df463832" into qt-r1-dev-plus-aosp