Merge "Do not change created-by-organizer task to different organizer" into...

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

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



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