Merge "Merge "Make FRP APIs callable by Settings" into rvc-dev am: 7bd3e833 am: 36fdaed6" into rvc-d1-dev-plus-aosp