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

* security-aosp-nyc-mr2-release:
  Prevent OOB read in rw_t4t.cc
  Prevent integer overflow in NDEF_MsgValidate

Change-Id: I5185fd0e794f37b2fe3001bb1f945415dc54c3b8