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

# By Arun Ravindran
# Via Android Git Automerger (2) and others
* commit 'd080bb07c88ca5ccf99f326789ed472448b50832':
  Services: Adding HSPAP info in Android