Merge "Make unfold timeout configurable in resources" into tm-dev am: 915970e4 am: e317ab47

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17539068



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