Merge "Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba3 am: 2d56a156 am: 219316d7" into rvc-qpr-dev-plus-aosp