Merge "Make EphemeralTest test apks target API 26" into pi-dev-plus-aosp