Merge "DO NOT MERGE Fix PopupWindow test even though when window inset is zero" into oreo-mr1-cts-dev