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

Change-Id: I2cdc37710191188b232439acfb38bf7a7afb8327