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

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



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