Merge "Make FRP APIs callable by Settings" into rvc-dev am: 7bd3e833 am: 7ef6e631 am: 9817e072 am: 3eb50af5 Change-Id: Iea25f17b96a700101b03b9ce7c4cf6bb4a7162c1