Merge tag 'android-security-15.0.0_r6' into staging/lineage-22.1_android-security-15.0.0_r6

Android Security 15.0.0 Release 6 (12895207)

* tag 'android-security-15.0.0_r6':
  Resolve cross account user icon validation.
  Unbind CS if connection is not created within 15 seconds.
  Revert "Unbind CS if connection is not created within 15 seconds."

Change-Id: Ifc6f72856e8e608e5631d0ff30ad6a7f2d07be8c