am fcaed606: Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev

* commit 'fcaed60650ed8e44a416e7ba05c281aae643b0c6':
  Fix issue #20654534: API Review: android.app.assist