Merge changes from topic "stable-aidl-nullability"
am: fb3c17bc30

Change-Id: Ia41abb1b2b8ae2ad790a80ea0bde1930f5841daa