[automerger skipped] Merge "Pass Binder token to...

[automerger skipped] Merge "Pass Binder token to ISuspendControlServiceInternal#enableAutosuspend" am: 530fbd2d am: 91b63223 am: acedbfbd am: ecadc236 am: a1eeb82d -s ours

am skip reason: Merged-In I918e7d2180eb47f078ef57732ae0e2dcd5e1f2c3 with SHA-1 5897e987 is already in history

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

Change-Id: I0f0fa747732a44ba9b7414b78233430618cc4dda