Merge "Fix a bug in timeshift mode" into udc-dev am: 750d5d68

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



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