Merge "Add deprecation warning to adb backup/restore"
am: 09070afd38

Change-Id: I8025d39a8305677c1e086dc885bc02efca6ac29b