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

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

Change-Id: If781f3255db49239c3ce193a72c5acc99d57aba1