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

* security-aosp-nyc-mr2-release:
  Camera: Initialize metadata padding field

Change-Id: Ie96f68936e3e48a95dc625264b1dd587c172b7b7