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

Merge "Reduces the timeout of rotation memeorization." into sc-dev am: 99f8b533 am: 8bdf84b0 am: 2a5dccfa am: dc2dc1ec

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

Change-Id: I571e8805b39dfcb157842b4ef8618b2864e2f06f