Merge "Mention the tag to use to bypass the AOSP-first check." am: 7c25a55f5d am: 542c95130e

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

Change-Id: Ic7936d37eba0ce34eb631b2c38fe0a6b8e53febb