[automerger skipped] Merge "Add aidl::nullable type for nullable in AIDL" into...
[automerger skipped] Merge "Add aidl::nullable type for nullable in AIDL" into rvc-qpr-dev-plus-aosp am: ad6d0ab4 -s ours
am skip reason: Change-Id I378dbf848a51a705a9e06f9cd4b0def9728c3bff with SHA-1 ed9884cd is in history
Change-Id: I15d1a55b4765786d1b5ad26a9237c8b44433f0eb