Merge "Fix split black if active from pip" into sc-v2-dev am: cfcfa22395 am: 29833a51f3

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

Change-Id: Ie7dfd900af55c947c5770ee409b23e220f632353