Correctly backup granted state for pre-M apps

Pre-M apps always have the permission granted. The revocation state is
stored inside of the app-op matching the permission.

Hence we have to take the app-op into account when backing up the
permission. Please note that if the permission still requires review,
the permission state is irrelevant as it will always be overridden
during review.

The restore path already calls group.grantRuntimePermissions which
handles the app-ops correctly.

Test: Built
Change-Id: Ic151c61839292ca88f71bf54b23ccd6ff20f3c69