Merge "Support adding custom tags to APIs." am: 841022227d am: 5349732bf4

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

Change-Id: I989ec30f75b529556c17b19f58da25efd51d4259