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
tree: 4af35c7b6b118188d82c6d8d8a7044e92034fb70
  1. msm8974/
  2. msm8998/
  3. Android.mk
  4. CleanSpec.mk