Merge "Fix deadlock between AppOpsService and HistoricalRegistry." am: 21a4becee0 am: 476c64e470 am: 7904074696 am: b3b2334a37 am: 736996e4ab

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

Change-Id: I9596a78680a67dc420587263008590edfa8e8e9d