Merge "Allow extending qualifiers of function parameters and return values" am: 82b8191b50

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

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