Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am: 82b41e460c
am: 874b6402af

Change-Id: I3db14694bc27e9fed16b5efec6aba99570b89675