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

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

Change-Id: I1cfbc86ff704c155cfeef3cf9d2852f7cb52dbd3