Merge "Fix minSdkVersion for test."
am: 08b2412696

Change-Id: I70c1071b9cae6c4c3f9ac7b76ef488e38155836f