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

Change-Id: I41ae908e86152f42590fc346db382419c5b0a27b