Merge "Exempt-From-Owner-Approval: Workaround for build break on WifiNl80211Manager"