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

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



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