Merge "Use the same name for PipContentOverlay variants" into tm-qpr-dev am: 98b21ffca9 am: 5bb1585337 am: 299d792908 am: 8efd891a10
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21684059 Change-Id: I5fd0912eca7a1e8f31ab004e3f257b883f3463ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: