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

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

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