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

Change-Id: Ie3f5538a28c4b6b462017fc199362fd0d57b0a5b