Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8
-s ours
am: 18cd618368
Change-Id: Ia4986adc50cca19ca72e2e036cd7bef78006bbaf
This commit is contained in:
cb9a7075f8
-s ours
am: 18cd618368
Change-Id: Ia4986adc50cca19ca72e2e036cd7bef78006bbaf