Merge "Remove obsolete VERSION_SPLIT_ANR" am: c5a4602831 am: 3f88273d69

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

Change-Id: If592152b49d44cffcb4a98756757f8a6a393a4ce