Merge "Properly check for SDK before nullifying attribution tag" into sc-dev am: b3c8d6d2 am: 7b995535 am: 069d0a2e

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

Change-Id: I204157086da8997c87721c240b11326edbacfa1e