Merge "Fix split root removed accidentally" into tm-qpr-dev am: edc6a560

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



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