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

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

Change-Id: Idf0dce1c0c85f37a8c329180b4c06639ab970a05