tree 193c0fbf4bf0bf29e1dcbac830d042a9c33c9a14
parent 8501559cba844802348ad6028bcc65a3bfe1f87b
parent 2ffc4498d474468fb28e9b15484b887f77eeff2e
author Karsten Tausche <karsten@fairphone.com> 1611133782 +0100
committer Karsten Tausche <karsten@fairphone.com> 1611133782 +0100

Merge the 2021-02-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  Cherry-pick one upstream patch

Change-Id: I3680132d305950067febd94f29d1b686c6be4b8d