Android Mainline 11.0.0 Release 35 (7314025)
[automerger skipped] Import translations. DO NOT MERGE am: 85185fe58f -s ours am: 2ace5da90a -s ours

am skip reason: subject contains skip directive

Change-Id: I4ed85359f18d86633f0334afe017e4c91f81e13e