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

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

Change-Id: Ia9c983bf4c67701125463241d249309372578251