Merge "Do not set Notetaking shortcut to default if Stylus is not detected"...

Merge "Do not set Notetaking shortcut to default if Stylus is not detected" into udc-dev am: 26ac560f am: 7ebe0bd1

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



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