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

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

Change-Id: I9d89f556e5fcca621f9e5e0314c9996faaf8ea11