Merge \"Merge \\\"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\\\" into nyc-dev am: 8afc1f70f0 am: c6413cc919\" into nyc-mr1-dev-plus-aosp
am: 8bd0506261

Change-Id: I7629af57b71712873f9b08409a2c0cdf40103b34