Merge "Skip BackupQuotaTest if FEATURE_BACKUP is not declared am: b86c3512cd am: cdd3107de4 am: ef826f9d4c" into nyc-mr2-dev-plus-aosp
am: e3679d68aa

Change-Id: Ie7de4682dd4feda84d603db2ed31ae4c0c618f35