Merge branch 'security-aosp-qt-release' into int/10/fp2

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

Change-Id: I89af1e62e455a41fc1dc0ebe7eba8aac489503d3