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

Change-Id: If66284619518916e18d867a10cbc42a635d69317