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

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

Change-Id: I72f16350e2d703e20c1c3a4f9b2054ed02700bfa