Merge changes from topic "Backport: tag availability checking mechanism" into...

Merge changes from topic "Backport: tag availability checking mechanism" into sc-v2-dev am: 0412d794 am: 8699887e

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

Change-Id: Ic579c801d05996d1b71e5e9c7acfce47a30b51b1