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

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

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