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

Change-Id: I6a05a6ca8ad3313c901a2ad692851d2096b21e7b