Merge "Add a new system level permission that will allow a system app to track...

Merge "Add a new system level permission that will allow a system app to track factory reset preparation updates such as backing up of application data for existing apps on the device." into main