Merge changes from topic "am-a7446a6e34814019bac9941d457e9acb" into rvc-d1-dev-plus-aosp

* changes:
  Merge "DO NOT MERGE Add location shell commands to R" into rvc-dev am: c720603034 am: 25ea50d840
  DO NOT MERGE Add location shell commands to R am: bfe15a139d am: fa11abf943