Merge "Add developer options to force enable Notes role." into udc-dev am: b79772ac

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



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