Merge "Do not change created-by-organizer task to different organizer" into tm-dev am: d263c048 am: d494af23 am: dda7544e am: 93663d73

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



Change-Id: I6781f6f00ed2229734411ffd7cbaf6ccc1baef1c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>