[automerger skipped] Merge "USB firmware update for stylus in Stylus USI...

[automerger skipped] Merge "USB firmware update for stylus in Stylus USI Device Details" into udc-qpr-dev am: bbf2dc49 am: 3a67c3e1 -s ours

am skip reason: Merged-In Ic7cb35799ff00f9998ca569eb4ae091f8010780a with SHA-1 f0436354 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23221022



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