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