Merge "Add caption inset when moving to desktop" into udc-qpr-dev am: 2eb911d3

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



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