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

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

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



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