am 332cbf91: Merge "Test onProvideAssistContent and onProvideAssistData" into mnc-dev

* commit '332cbf9107f79ccfe119af7a3f0a9fd737a9ad3c':
  Test onProvideAssistContent and onProvideAssistData