am 2cabf4a9: Merge branch \'lmp-mr1-dev-plus-aosp\' of...

am 2cabf4a9: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp

* commit '2cabf4a9':
  PopupWindow: fix typo in doc comment