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

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

Change-Id: Id402ba836f3b97f0467f4bc73264eb00ead2f5e1