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

Change-Id: I9345f04b8ca27b370abd74e460e8f63b04b11888