[automerger skipped] Merge "Fix index when moving SecurityFooter" into sc-dev...

[automerger skipped] Merge "Fix index when moving SecurityFooter" into sc-dev am: d9f207c0 -s ours am: 9daa5405 -s ours

am skip reason: Merged-In Ibc85cd5501010fcf9752d8af103500479c6f28c2 with SHA-1 e52042c8 is already in history

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

Change-Id: I3c7af0fabac0b2469474b5c3795fc47c3d39b3ad