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

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