Merge "Revert "Update bluetooth perm checking to perm cache"" into main