Merge "Fix NPE in WakeLock#finalize for unit test" am: a29bc7bbd8 am: a0ab4f6bb2

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

Change-Id: I7f42c096500852b8a620f3fd75b728bd3fa39ff1