Merge "Flag desktop stashing behavior" into udc-qpr-dev am: 3a585ef0c5

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

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