Merge "Allow footer string support both mobile and tablet devices" into tm-qpr-dev am: 282d38eb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19781367



Change-Id: I043f96e50550c20d1d9be22c77deb6fcb969ff08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>