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

Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba3 am: d9f92e46 am: deb79777

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

Change-Id: I9f3ce26a8f549d6ad807559097c8735afa2b39b7