Merge "Allow footer string support both mobile and tablet devices" into...

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

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



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