Merge "Fix swapped int params in DisplayContentInfo ctor" into tm-qpr-dev am: 3c5854a4

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



Change-Id: I8adc558aee89be2d264e8b7c4767c0ee5ffd3846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>