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