[automerger skipped] Merge "Unify Aspect Ratio Logic in ActivityRecord" into...

[automerger skipped] Merge "Unify Aspect Ratio Logic in ActivityRecord" into sc-dev am: 0e7ef13b am: a2ac34a2 -s ours am: 5d6f17ad -s ours

am skip reason: Merged-In I40a071399e3bc159a20ade917da4c94cace0524e with SHA-1 fab18e35 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14907845

Change-Id: I0d96f394a0f049763213454994a7eab4421290ea