Merge "Cap resolution for pre-S apps on TV at 1080p" into sc-dev am: c43f1a2c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I772c21bb64b9b7709ddaad19a52ede6f28abf61b