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

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

Change-Id: I8a35e6224bc82585dca235ee40f8b2103a95c64b