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

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



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