[automerger skipped] Merge "Add DisplayContent#forceDesktopMode" into...

[automerger skipped] Merge "Add DisplayContent#forceDesktopMode" into rvc-qpr-dev am: 32212036 am: 6614e2ef -s ours

am skip reason: Change-Id I6ec52b6b1642fd547ebc222ae1bf9a2958e5fb2d with SHA-1 1e00756d is in history

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

Change-Id: Ie72bb67e2849604168e49f9df85946b9bc133c8f