[automerger skipped] Merge "Fix typo in aosp/1242602" into rvc-dev am:...

[automerger skipped] Merge "Fix typo in aosp/1242602" into rvc-dev am: 984a51c6 -s ours am: 9c7574b4 -s ours am: 2f3f278f -s ours am: 92b7150c -s ours

am skip reason: Change-Id Ie023c8371785fc239c54eacbf056141c2e9e3444 with SHA-1 74fcf728 is in history

Change-Id: Iac3250bd62dd312cddf60954e1a0f84190596a7f