Merge \"Merge \\\"Only clip PopupWindow in the vertical direction\\\" into nyc-dev am: 4b736ea56d am: bf91103763\" into nyc-mr1-dev-plus-aosp
am: 83a8bdb8b1

Change-Id: I3c4dd3ff0155c02157b8c1df54b99e77987872b6