Merge "Shorten IME surface caching duration" into tm-dev am: c54e991b am: a72019a7 am: d96bb825

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



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