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

Change-Id: I7ad8727e62802411caea66fab8e81decd6878abb