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

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

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



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