Merge "Revert "Add a delay to rotation updates to help avoid fold state race"" into tm-qpr-dev am: c4b1be4d am: 3a00521a am: 166086e1 am: 4dc9733d

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



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