[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 am: eb956a30 am: a0b43aca am: 869fb83b -s ours am: 61cd4943 -s ours

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

Change-Id: I418ad54e470f7e65df4b29e4534d78eeaf433a05