Merge "Add fallback summary text if there is no matching screen timeout value"...

Merge "Add fallback summary text if there is no matching screen timeout value" am: 007c215c am: 44431c73

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



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