[automerger skipped] Merge "Use optional for nullable types" into...

[automerger skipped] Merge "Use optional for nullable types" into rvc-dev-plus-aosp am: 238660ef am: a51e0a68 am: ad03b4cb -s ours
am skip reason: Change-Id I90cf2ce1193c479179687d71a5c1416f6cdf0b16 with SHA-1 53be7f4d is in history

Change-Id: Iaaf249011f0bb6aca989cca05388465a758ba5b2