Merge "Add a new flag for desktop mode proto 2" into tm-qpr-dev am: 17068514 am: f21cce1f

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



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