am e4d2b52d: merge in master-release history after reset to cf8fb22d2bee6d7a7a73e78f7920b9f51399e00e

* commit 'e4d2b52d14533b105473419748e678a302dea87f':
  Fix b/15015329
  Fix bug #13563247 Settings crash on launch in secondary user
  Remove unneeded new RIL command.
  Fix bug #12910775 Settings crash after tap on Access Point Names under Mobile networks