Merge "Fix some issues that make caption insets remain" into tm-qpr-dev am: e2823f9a

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



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