Merge "Remove DialogInterface.OnDismissListener and DialogInterface.OnCancelListener interfaces from SearchManager class."