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

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