am 9434c112: Merge "Services: Adding HSPAP info in Android"

# By Arun Ravindran
# Via Gerrit Code Review (1) and Shuo Gao (1)
* commit '9434c112d1fef52ade78d7ef818daf981bf63bef':
  Services: Adding HSPAP info in Android