Merge "Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba3 am: d9f92e46 am: 810612fb" into rvc-qpr-dev-plus-aosp am: 81b21094

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

Change-Id: I18e4d6cfca46c56e505e28e597ca191943007365