Merge "Clear binder identity before releasing wakelock" into sc-v2-dev am: addb12da

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

Change-Id: Ief926c88fe0c22d19b981847586df42d05442ff9