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

Merge "Reduces the timeout of rotation memeorization." into sc-dev am: 99f8b533 am: c8cf1ede am: facc44e5 am: 41b5ca13

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

Change-Id: Ifada2cca0c70d000519c276cdac30c2ea66922da