Merge "Fix a bug in timeshift mode" into udc-dev am: 750d5d6837 am: 01b2b78fe3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22749264 Change-Id: I727722ccd4edc1d4251a3678051fbebb90a7d2ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: