Merge "Merge "Skip BackupQuotaTest if FEATURE_BACKUP is not declared" into nyc-mr1-dev am: b7f33fffee am: f181b1fdaf am: 7b38eb8b91" into nyc-mr2-dev-plus-aosp