Merge "Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45" into rvc-d1-dev-plus-aosp am: 04be843ab3 am: 90da510597

Change-Id: Id137c8c1654873601b5ceddb5883e03fd3cb13e9