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

* commit 'bc92ab1522c17bebf00a9e95076a1cd097db9896':