Merge "Retain the short-term model when device state changes" into tm-qpr-dev am: 13652c7a

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



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