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

Change-Id: I76b103fa54c7e357e3fc941b704b0d6ed010f2e7