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

Change-Id: Iffb8b725b14e404c3a62ad58d17af075ac1289d5