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

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

Change-Id: I6b324c5bc8519fdac0e23ebd210ec173a9f8df0c