[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am: b5e7bbe5b8 am: 1bb102e37d am: 1c348395f5 am: 26fda93676 skipped: cf76183e6c

Change-Id: Ifd0a52ac469b9d59aa43b3849b5cfbabeac99ed5