Merge "Ensure that proxy operations look for attribution tag in proxy's pkg" into sc-dev am: 9aeedf48 am: 51ce61e7

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

Change-Id: I2c1d1454635fa1ff703944a6ba0214f35de58998