Merge "Update API text file format to include missing generic signature" am: 5ec41c255e am: d71d9086d1

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

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