Fix potential deadlock in shutdown in HistoricalRegistry am: 4a2d4ddf6e

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

Change-Id: Iedd8d3224a84f0ba0677709091982abcba54ec9e