Update checks for N+
Replace checks for Build.VERSION.CODENAME.equals("N") wieth
Build.VERSION.CODENAMES.equals("N") || Build.VERSION.SDK_INT > Build.VERSION_CODES.M.
Eventually we will want the check to be just for SDK_INT, but for M51 we'll
use the ||.
BUG=
586703
Committed:
https://crrev.com/96a31a443985b11f125797d32f837eff42f2efb3
Cr-Commit-Position: refs/heads/master@{#394615}