Merge "Merge "Correctly offset app op history on reboot" into rvc-dev am:...

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11747376

Change-Id: I01a830e46b36ae7c773bce2a3ec8d80b1920d389