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

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

Change-Id: Iba05ad9051487dfe285997e97b5075579602a88d