Merge "Allow attribution source to be correctly set" into udc-dev am: 6abb34e7 am: 4eea7963

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



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