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