Merge "Make FRP APIs callable by Settings" into rvc-dev am: 7bd3e833 am: 7ef6e631 am: 42177eba Change-Id: I720704145c65a79e1e71ef636c2170293e073211