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

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

Change-Id: I8c62def14eba9348649918e25a23828b93bc37be