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: d33e08ab

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



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