am b078ff16: am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod"

* commit 'b078ff16a3ea83f7e4f444eb7b7b699ee8e913a6':
  Frameworks/base: Fix potential NPE in InputMethod