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

* security-aosp-pi-release:
  Revert "HAL3: Fix a use-after-free bug"
  HAL3: Fix a use-after-free bug

Change-Id: I36b5ae11b6b862d780ef59c97488670b8bb0e4c7