am 13d72e48: am f1860e8f: am 4e0b78eb: am 827d9539: am 332cbf91: Merge "Test onProvideAssistContent and onProvideAssistData" into mnc-dev

* commit '13d72e48ec6e6030da95f6c35ceac806e322d3fd':
  Test onProvideAssistContent and onProvideAssistData