Merge "Minor fixes and tests for multiple full users for stylus notes app"...

Merge "Minor fixes and tests for multiple full users for stylus notes app" into udc-qpr-dev am: 76f815f7 am: 3790a017

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



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