Merge tag 'android-security-13.0.0_r23' into staging/lineage-20.0_android-security-13.0.0_r23

Android security 13.0.0 release 23

* tag 'android-security-13.0.0_r23':
  Revert  "Unbind CS if connection is not created within 15 seconds."

Change-Id: Ie84f35971a46db766600a7af3344f782f04daba0