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

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



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