[automerger skipped] Merge "Make EphemeralTest test apks target API 26" into stage-aosp-master am: 39948f4274 -s ours
am: 1775fce9e9 -s ours
am skip reason: change_id Ib0fcd429463e36293f5c19f58b65ab2b76ffbed8 with SHA1 6a0b0466ad is in history

Change-Id: Iece25d1384b831e02315d9b547ea07437b62a03a