Simplify metadata listener registration & unregistration

Bug: 145171640
Test: compile & run
Change-Id: I7076c1e05b3a63d115ac6c5d7eb696c8d40a2060
1 file changed