Merge "Revert "Increase debounce time for DISCONNECT processing"" into sc-dev am: 3e46e3bd10

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16439364

Change-Id: I296a8678a6120c36a5d501f64134647d5fa6eb18