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

Merge "Fix unregister after delayed register" into sc-qpr1-dev am: f9828e97 am: 22f3d45b am: f4a52157

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

Change-Id: I4bebfc196405ca287e79ed2326d0fd0e3915e25b