[automerger skipped] Merge "Fix typo in aosp/1242602" into rvc-dev am: 984a51c6ee -s ours am: 79606cc385 -s ours
am skip reason: Change-Id Ie023c8371785fc239c54eacbf056141c2e9e3444 with SHA-1 050c7de093 is in history
Change-Id: I574c5bfe597d008a8775978b37fa0f5d1d9dd67d
This commit is contained in: