Merge "Update BasicRuntimePermissions sample for API 23." into mnc-dev