[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-d1-dev-plus-aosp am: b727f1be -s ours am: fe85c63e -s ours
am skip reason: Change-Id I378dbf848a51a705a9e06f9cd4b0def9728c3bff with SHA-1 ed9884cd is in history
Change-Id: I5c1ecea4c61bbda8597de73880ec71c868b70c38