Merge the 2018-09-05 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  Ignore quotes in safe_print().

Change-Id: I87e057b9da446b54d36b68d56060722705b85a0d