Merge "Respect style when source is also set" into tm-dev am: a9448a67 am:...

Merge "Respect style when source is also set" into tm-dev am: a9448a67 am: f65c1df2 am: 7cac1988

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



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