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: I36e6e37c7abe1750a9d19dfe3d9e81f96fa1073e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>