[automerger skipped] Merge "Add GLES dEQP level feature flag" am: bdb4677d am: 37f7971d am: cff7cd0d -s ours

am skip reason: Change-Id I830fbfcff617c891a42ca46396adf0283a52b874 with SHA-1 8524b7f3 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533279

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I018aeb2258aadeceacaea552aed4efcf31bef6bb