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

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

Change-Id: I2621829ef0865403a077e6f305027b2c475f269d