[automerger skipped] Merge "Make EphemeralTest test apks target API 26" into pi-dev-plus-aosp
am: 35fa2d57ef -s ours
am skip reason: change_id Ib0fcd429463e36293f5c19f58b65ab2b76ffbed8 with SHA1 af4acc5a47 is in history

Change-Id: I896d8686dc3849862e4acda839a64a7201d7c80f