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: 45e34780 am: f6d0a3f3

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

Change-Id: I8f2533e14f5ed6861fd6264adc1d41db8388accc