Revert logic to unregister callback in the background thread

Partial revert of commit cea5ce82cfbede9d0dd386251899446c55951b61 due to NPE

Change-Id: Ic9f886f4741774fb4a24200a4d38f770f7ecc775
Fixes: 338493059
Bug: 336612071
1 file changed