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

* security-aosp-pi-release:
  avcenc: Add bitstream overflow check during emulation prevention

Change-Id: Ic51cfad541ff4a54b249042cca79e138f24c1998