Merge "Only reset short term model after timeout" into udc-dev am: 85265850 am: 7be2ce5b

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



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