Merge "Layer caption container surface behind corner input region." into...

Merge "Layer caption container surface behind corner input region." into udc-qpr-dev am: 9b9d6d06 am: 9cf1f111

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



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