Merge "Associate freezing display with a target display id." into oc-dev am: 1795242288
am: 2112d52636

Change-Id: I63bef7c4871117bd22bf552da696a20b889d27cb