Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864" into klp-dev
am: df7bd91dfa

Change-Id: Idec27e5beca07ace75b08de5ce0b6ee8bf1ab7f7