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

Change-Id: I259abdec68097485aa875e802a3e39b6098fba9c