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

* security-aosp-pi-release:
  Decoder: Update check for increment u2_cur_slice_num

Change-Id: I25b6cc3b7dc32c0b7b14cb100d0e7f1adf5f66d3