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

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