am a0bef60c: am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

* commit 'a0bef60c3670e4484b5bfc3fc5cc79b7f9918603':
  Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]