[automerger skipped] Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev am: 809231680f am: 21c4a58435 am: 499b803c52 -s ours
am: 3148adad10

Change-Id: If0f54b753c80f432cd79b98228f5ad1566a34049