Fix inconsistency between API generator and CTS files

http://b/27205695

https://android-review.googlesource.com/#/c/167844/ was generated with a
version of API generator that missed the changes from
https://googleplex-android-review.git.corp.google.com/#/c/733182/.
Invocations of the API generator produce spurious changes to two
generated files in CTS.  This CL has those missing changes.

Change-Id: Iac268723de32ac6132bb55c90bbc0ade9231c1a6
(cherry picked from commit 49a6bc5390a5d66a4374742d5fa01323869acb87)
2 files changed