[automerger skipped] Merge "Allow split position constants to be used in...

[automerger skipped] Merge "Allow split position constants to be used in launcher." into sc-v2-dev am: 99461804 am: 68ab1bd4 -s ours

am skip reason: Merged-In I7c5649449389413d1435798c3e757103c4ced038 with SHA-1 a191eb7e is already in history

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

Change-Id: I50bc6f7d3a51e33d82e495643ff1c7c97d10bb2c