Merge "AnimatorInflaterTest should not rotate square screens." into nougat-mr1-cts-dev