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

Change-Id: I39b614ab03c897ff6f88ac5d677747530c0125c0