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

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



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