am bfabed1f: Merge "Revert "As per the android documention 480p is defined as  720x480, 704x480 or 640x480. The test is hardcoding 480p to 720x480 and hence the test is failing other combinations."" into kitkat-cts-dev automerge: d1a5a58

* commit 'bfabed1f2dd77a710fdc98985c8db20347571ce9':