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

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