[automerger skipped] Merge "[DO NOT MERGE] Start editor as the launching user...

[automerger skipped] Merge "[DO NOT MERGE] Start editor as the launching user instead of personal" into tm-dev am: cfc0408e am: c0506113 am: f994f8a7 -s ours

am skip reason: contains skip directive

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



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