[automerger skipped] Merge "Correct nullability and final constraints on new APIs." am: cdbfa9d087 am: 5a7b8ca4e0
am: 0f945a1ce9 -s ours
am skip reason: change_id Icec15403493de596194a61b27bb3e1031fdc1099 with SHA1 5c1a4e0bf3 is in history

Change-Id: I7d95b3bbf9721a9edd2ca6642fb6f3415e9a36cc