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

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

Change-Id: I42fa1dec4a23fabdb58cd08d831c5861295c9e37