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

* security-aosp-pi-release:
  Fixing small bug for sec release

Change-Id: I56611b041574677d0d254a7ab0a583a42ea0e052