Merge "Increase debounce time for DISCONNECT processing" am: a1be0e120a am: 91c1b1c056

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie945dd56a4d77a8da4a7b9b0e4c60e76718e4b6b