Merge "Allow extending qualifiers of function parameters and return values" am: 82b8191b50 am: 2a813cdeb7 am: 0c20c58b66

Original change: https://android-review.googlesource.com/c/platform/development/+/2337410

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