Merge commit '44dcf411b01bdbd0ae2aeef3e958403a1096f36b' * commit '44dcf411b01bdbd0ae2aeef3e958403a1096f36b': fix [2297155] SurfaceFlinger's freeze-timeout doesn't work
Merge commit '44dcf411b01bdbd0ae2aeef3e958403a1096f36b' * commit '44dcf411b01bdbd0ae2aeef3e958403a1096f36b': fix [2297155] SurfaceFlinger's freeze-timeout doesn't work