Merge "Don't display QS security footer in demo mode" into oc-dr1-dev
am: ae6776a839

Change-Id: Ia432b6ba609222fce86ec5ce9cb07e443873114e