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

* security-aosp-pi-release:
  RESTRICT AUTOMERGE ANDROID: Fix negative stack write in sgdisk

Change-Id: I5bf5f34928133c577a86521c86c84fbde3b947b1