Merge "Merge "Merge "Call removeMessages() only for certain operations in BackupManagerService#handleCancel()" into oc-dev am: 5281775760" into oc-dev-plus-aosp am: 254d2512d3"