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

Change-Id: Idacb3edea0e9917e2ee4421763252f83f7a7e9da