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

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

Change-Id: I59ee593fe621082b69aab063f97572899c41f892