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

Change-Id: Icf545616e6e7d2184c5e0ea366523536f9479a1d