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 am: 332183ee

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



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