Merge "Fix a small bug where desktop mode changes might not be applied" into...

Merge "Fix a small bug where desktop mode changes might not be applied" into tm-qpr-dev am: 328b3d9a

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



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