Merge "Fixed the failing tests in com.android.server.dreams" into main