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

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

Change-Id: Iaa35d4fca45821e529383afda80c054e7f91644e