am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev

* commit '21246bd92f54be468496848b659bf47f2522430a':
  Fix isThemeAppCompat NPE when using an invalid theme