Merge "Store whether attribution tag is valid separate from bypass" into...

Merge "Store whether attribution tag is valid separate from bypass" into sc-dev am: 6d3212e6 am: 225ca7c7

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

Change-Id: I7e5544d92f0e3218f8e3bfec2c6758dae0f5a815