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

Change-Id: I76640f881b58c03b73fda80ff2536eb2a966d5ab