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

* security-aosp-pi-release:
  Camera: Fix possible ExifUtils heap corruption

Change-Id: I8ad7b421e39f9aeba54ca70614ad4cb72cc6bb65