Merge "Do not dismiss USI notification when stylus is bluetooth connected."...

Merge "Do not dismiss USI notification when stylus is bluetooth connected." into udc-dev am: d4bb4117 am: 5284dd48 am: 78f223b0

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



Change-Id: I8fa51908d192561a05bf0aaa3e77749ac21c72ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>