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

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

Change-Id: Iddeeb0525aa4e86294bcc91fac9e5bd188525062