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

Change-Id: I87431bd661f6d5243d4c442e3caf6db247dc89bd