Merge "Merge "Don't show unsupported sdk warning in test harness." into pi-dev am: 444885b10d" into pi-dev-plus-aosp
am: cd6eae6cce

Change-Id: Id6e530efea409379ac882843824baaf3260cb264