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

* commit '55d496764c8989cdf5da7ef3497b19988eea8f5b':
  Fix isAtLeastN() on builds where the codename is REL

Change-Id: I6465397cf50f0a0e32c41312ae37f9a681c58350