Merge "Hard code caption insets for caption in WM shell" into udc-dev am: cc12355d am: d15242c9

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



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