[automerger skipped] Merge "Correct nullability and final constraints on new APIs."
am: 4b2b84931a -s ours
am skip reason: change_id Icec15403493de596194a61b27bb3e1031fdc1099 with SHA1 b6940c3ea6 is in history

Change-Id: I74dab8e1d49d4b0230426a889ddf65a2570ab2e5