Merge "Acquire the wake lock to ensure RoR isn't delayed" am: 9dbd3ea3e0 am: c8eebe97e7 am: c6cc6d355e

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

Change-Id: Ia5af9d07414c6044cbdea6e1cc9db793488e62e2