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

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

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