[automerger skipped] Merge "Unify Aspect Ratio Logic in ActivityRecord" into sc-dev am: 0e7ef13b am: e5cf7d81 -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: I3a7de695bfa8871deea94f323e3d48fe8f3257ad