[automerger skipped] [DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control
am: 02f38c7284  -s ours

Change-Id: I5c32b453930c99532a3ca4ae5c807a2ed9030e26