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

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

Change-Id: I55812bed4c127e07a4ff21f2bd801f15a988e410