Merge tag 'android-security-11.0.0_r50' into int/11/fp3

Android security 11.0.0 release 50

* tag 'android-security-11.0.0_r50':
  handle cases where order isn't a multiple of dimension

Change-Id: Ib52f922bc6677bca36236bd2ae47fe390b1f7287