Merge "Update API text file format to include missing generic signature" am:...

Merge "Update API text file format to include missing generic signature" am: 5ec41c25 am: d71d9086 am: bdd41e7b am: 87e9991b am: d26e0bc5

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



Change-Id: I6167fdbf1e387d3d4d65e9d327374797f15dbe34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>