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

Change-Id: Ic448d0f9fc85a2acc850e91cb7f6a7f7a2566ca5