Merge "Change ownership of resumeonreboot module." am: 5a700f759d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1985526

Change-Id: I97bb619d188e3dbc0bac5478cfd921c73b5c1d9d