Merge the 2019-10-05 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  [DO NOT MERGE]Prevent length underflow in NfcTag.cpp

Change-Id: I9a054dde04ad0312eed1b8b561406b17c93a3bac