Import from build id 11885099.

Generated with:
$ packages/modules/common/tools/finalize_sdk.py -r 'Finalized together with Android 35 (all modules)' -b 340822159 -f 13 11885099

Bug: 340822159
Test: presubmit
Change-Id: Ib348ac0736e1f07c64762db2c513151e3f249a24