Merge "Remove obsolete VERSION_SPLIT_ANR" am: c5a4602831

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1967963

Change-Id: Ic548e5b469a867ac11b8f7643dc9df4c86716325