[automerger skipped] Merge "DO NOT MERGE Add location shell commands to R" into rvc-dev am: c720603034 am: 25ea50d840 am: 50fe5df825 am: 42798617cd -s ours

am skip reason: subject contains skip directive

Change-Id: Ief4cb9a7c3adc569f40bd81d832d22ec816f393d