Merge "Merge "Remove observer when QSBH is detached" into rvc-dev am:...
Merge "Merge "Remove observer when QSBH is detached" into rvc-dev am: a2c525fe am: fca5fb58" into rvc-d1-dev-plus-aosp am: f75f7c05
Change-Id: I00fe356b911fee0e43094b7833bff1ec5bfffe27