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

* security-aosp-pi-release:
  libutils: check vsnprintf error
  String16::remove - avoid overflow

Change-Id: I356a5734ccac24b20f27e3f8577861884b69acda