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

Change-Id: I5c7df1fd86ece1f84fba51250568a0d049b591f9