Merge "Flag desktop stashing behavior" into udc-qpr-dev am: 3a585ef0 am: 00b44521

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



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