Merge "Add DisplayContent#forceDesktopMode" into rvc-qpr-dev am: 322120364a

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

Change-Id: Ie6df127c98ae7d2f454ab8d98502e5118c991f08