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: 39fbe381 am: e2a9d930

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

Change-Id: I22457cd51d3325b5fee5df98ac75efe0b6647425