Merge "Fix deadlock between AppOpsService and HistoricalRegistry." am: 21a4becee0

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

Change-Id: I6b7df19f748602ec4448619d204ba9e515d14a44