Merge "Adjust caption observer for desktop transition" into tm-qpr-dev am:...

Merge "Adjust caption observer for desktop transition" into tm-qpr-dev am: 556ecc8d am: 0ac4d2e8

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



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