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

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



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