Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983

Change-Id: Ic438fc8b8ba8a62cb718f18a5edb83066f132efe