These changes are needed to ensure that "checkapi" doesn't claim that we're changing the API after an upcoming doclava change. Test: manual inspection of API text files Bug: 69505783 Change-Id: I8292ba80cc65b7dd78f0e9dba4fcc7ffcedfab9c Merged-In: I8292ba80cc65b7dd78f0e9dba4fcc7ffcedfab9c