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

[automerger skipped] Merge "Fix index when moving SecurityFooter" into sc-dev am: d9f207c0 am: ab38de65 -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: I259774c3b7bcda84e95a8346e76f4d1d4a774b61