Merge "Merge "Fix exception of unregisterCallback when callback is not registered" am: 43b75cad9e am: d526de2ca2" into qt-dev-plus-aosp
am: 1b846b4604

Change-Id: If20741319174bf3bb9a9addddc47b8fc55ec023f