Merge "Revert "Add the min aspect ratio to ActivityRecordProto and popu..."" into android12-tests-dev