[automerger skipped] Merge "Use optional for nullable types" into rvc-dev-plus-aosp am: 238660eff6 am: a51e0a687a am: ad03b4cb78 -s ours
am skip reason: Change-Id I90cf2ce1193c479179687d71a5c1416f6cdf0b16 with SHA-1 53be7f4db4 is in history
Change-Id: Iaaf249011f0bb6aca989cca05388465a758ba5b2
This commit is contained in: