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

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

Change-Id: I1ac7b09884ccc4a44612b6dbb25c57bcfc7ce326