Merge "Don't crash when there is no rollback dir" into main am: b33558c1 am: a226197d

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



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