[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am: b5e7bbe5 am: 1bb102e3 Change-Id: I0499fab6407457adb226a0fef751e22c9566179f