[automerger skipped] Merge "Introduce concept of DockUser" into tm-qpr-dev am: 9703f6a1 am: 632754a4 -s ours

am skip reason: Merged-In If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd with SHA-1 81e5f373 is already in history

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



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