Merge "Fix issue #21945272: Crash in Activity.dispatchRequestPermissionsResult" into mnc-dev