[automerger skipped] Merge "Freezer: fix binder race" into sc-dev-plus-aosp...

[automerger skipped] Merge "Freezer: fix binder race" into sc-dev-plus-aosp am: 85c72879 -s ours am: 75373b58 -s ours

am skip reason: Merged-In I1009fa33edbd2b1db14cf51b598f5869d41ee6b6 with SHA-1 f3925cbf is already in history

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

Change-Id: I42ab9f5a5472739f621b71ce190f58db074071a8