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: Ia01c0a31e89a2fce5b13d81c674ac1aa690d4606