[automerger skipped] Merge "Hide security footer container (QSBH) in portrait" into sc-dev am: d8610fbe51 -s ours

am skip reason: Merged-In I4e5754c92c386cb9ce9e2ecc7e22a0f0c0c3fd04 with SHA-1 001bd61257 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16118089

Change-Id: Ibf77b6adf88c3c1d3b4590bbdf59003e0c582902