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

Change-Id: I984611ffa131e55ed89c6ac5d17c203417b4ad79