[automerger skipped] Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c3 am: d8124d47 -s ours

am skip reason: Merged-In I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0 with SHA-1 04c66a0a is already in history

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

Change-Id: Idb19d10a976088c5a0d7bbbefe4f01a53264b0a4