[automerger skipped] Merge "Introduce concept of DockUser" into tm-qpr-dev am:...

[automerger skipped] Merge "Introduce concept of DockUser" into tm-qpr-dev am: dbd88822 am: 2a0dbb45 -s ours

am skip reason: Merged-In Ic671c91c32e9bf24695b067ff97cf9fa65534b1e with SHA-1 48d81ecc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20406317



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