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

Android security 15.0.0 release 7

* tag 'android-security-15.0.0_r7':
  Revert "Resolve cross account user ringtone validation."
  Resolve cross account user ringtone validation.
  Ensure ScheduledExecutor is not shutdown before scheduling timeout cleanup.
  Ensure connection is unbound on call redirection timeout.

Change-Id: I0a9e252802bc5944134338ef6df82e41dfef943e