Merge "Add a delay to rotation updates to help avoid fold state race" into...

Merge "Add a delay to rotation updates to help avoid fold state race" into tm-qpr-dev am: d094fe25 am: 1d480ca0 am: dad0c556 am: 23a0e7c6

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



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