Merge "Clear binder identity before releasing wakelock" into sc-v2-dev am: addb12da35 am: 129e389bc7

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

Change-Id: I5db4b0efae8865af843cb2723834ec5077befc53