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