Merge "DO NOT MERGE: Added skip of android.backup.cts.BackupQuotaTest#testQuotaExceeded if LocalTransport is not present" into nougat-cts-dev
am: 7af693a3fc  -s ours

Change-Id: I0ff2f45ef0dcc91943dae2622430086f557e7b90