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

[automerger skipped] [DO NOT MERGE] Start editor as the launching user instead of personal am: 9b1ff639 am: 3ed4214b -s ours

am skip reason: skipped by mrcasey

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



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