Merge "Freezer: fix binder race" into sc-dev-plus-aosp