Merge "Add DevicePolicyManager.setBackupServiceEnabled as hidden API." into nyc-mr1-dev am: dd6230d466
am: 157b98c134

Change-Id: Ibe08611f4ea565da4c9da09a3579eb68d36bd0b8