Merge "Revert "Remove dynamic location settings footer"" into sc-dev am: 83a305a0 am: f0814d24 am: 9adac450

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

Change-Id: I3e07816a48980cb879efb3336450d075fdb85aa0