Merge "Do not change created-by-organizer task to different organizer" into tm-dev am: d263c048 am: 0cee76c0 am: 5a53ee35

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



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