Merge pull request #9231 from Ebola16/ASW Android: Remove unnecessary WrongConstant warning suppression
