Merge "Resume in-progress operation after reboot." into main am: 044a9097

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2828630



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