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

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

Change-Id: I654c91680b7699e6c74d7677c03a12bf5976fcdd