Merge branch 'security-aosp-tm-release' into int/13/fp3

* security-aosp-tm-release:
  Fix for heap-use-after-free in GPUService.cpp

Change-Id: Ia5b58eaf9426f3bcefb1af830438b68edbf5b5e6