[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
am: 769c42790b -s ours
am skip reason: subject contains skip directive

Change-Id: Ibc4db3d1f31b55bbbd66e9107852856fc0fc2a9e