Merge "Fix broken test for stylus button Settings." into udc-dev am: a07ff94f83 am: 1194f74dbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252124 Change-Id: I8d56091ade399a01caa87068ffbead28ff2f4d86 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: