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

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

Change-Id: I8a14494d9c588d53c0aea1316f2a183d9b6bc7cb