Merge "Do not dismiss USI notification when stylus is bluetooth connected." into udc-dev am: d4bb4117 am: 8ad2e3a0

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



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