tree 209b5430f5755ab373065304a0adb1504bb9c687
parent 090f12eb5a8f27f90b41db46d20400a885113f5c
parent af029c3f326ec1df3101d1c4497f1e4fa0ae6a45
author Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> 1690484698 +0530
committer Maarten Derks <maarten@fairphone.com> 1690979936 +0200

Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  Cherrypick following three changes
  DO NOT MERGE - Cherry-pick two upstream changes

Change-Id: Icfb369267820f5ffd762461f8231a45def8f6a30