Merge "Merge "Update threshold criteria in CTS theme test" into lollipop-mr1-cts-dev am: 7388b5417a  -s ours" into marshmallow-cts-dev am: 30082a382d
am: 1f9f3c7a56

Change-Id: I0af28351fe6402cf7bff56bafba78749272ab4d9