Merge "Fix isAtLeastN() on builds where the codename is REL" into nyc-dev am: 55d496764c
am: 35afc151b6

* commit '35afc151b619ef1f21336776313158b98bbfc808':
  Fix isAtLeastN() on builds where the codename is REL

Change-Id: Iab5a483f0bbd2b8a0466b223f5e481db07b9ca9a