Merge "Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba3 am: d9f92e46 am: 810612fb" into rvc-qpr-dev-plus-aosp