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

Change-Id: Iace19d7405aae6b47fb33342dc3419921ebf6a5e