Merge "Use two-target preference for stylus handwriting toggle." into...

Merge "Use two-target preference for stylus handwriting toggle." into udc-qpr-dev am: 2d77f72c am: 2afb275e

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



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