Merge "Fix unregister after delayed register" into sc-qpr1-dev am: f9828e9795

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

Change-Id: I077853d6cf2d149b822f38fd83402fbc5fbbb745