am 4a909ab8: am d121059a: Merge "Make sure to not call getTelephonyManager with null context" into klp-dev

* commit '4a909ab8cd1a0e78c5af8fc531b8c702e8ae0aa0':