[automerger skipped] Merge "Retain the short-term model when device state...

[automerger skipped] Merge "Retain the short-term model when device state changes" into tm-qpr-dev am: 13652c7a am: fd54a6d5 -s ours

am skip reason: Merged-In I8a8a3f265c9510bda21abdf0563c02db3e11951e with SHA-1 bd748a47 is already in history

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



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