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

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

Change-Id: I4405ec52394c0093d0f37da512e5a2fd827a4e1b