Simplify callback register and unregister

Bug: 145171640
Test: compile & run
Change-Id: I1de9192070f0199be7206b167266ee076dc69dab
2 files changed