Is this in AOSP? I was assuming the changes are to GMS. I should hope that no distributor of AOSP(-based) images include this code anyway so it's just on the google devices