Merge "Reduces the timeout of rotation memeorization." into sc-dev am: 99f8b533c7

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

Change-Id: I75d88f8b08a542e17db148b76d2d4209c1c7b7ab