Merge "Update CarUxR APIs with finalized restrictions." into pi-dev am: b966052d2c
am: d3b4a36969

Change-Id: I1484f536485bb12986641aa786821d7ab376ae5a