Merge "Use AttributionSource Builder" into stage-aosp-master am: faffc6e464 am: a8f15dec67

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

Change-Id: Ief894f1e36ddabdcfb9efe851ade4332ffcd9bac
tree: ed597b04e5d050acba318ad9075ea175b4929bdf
  1. framework/
  2. service/