[automerger skipped] Merge "SF: allow more than one client to use...

[automerger skipped] Merge "SF: allow more than one client to use eEarly[Start|End] flags" into sc-dev am: 1d5541d4 am: a2ca8644 -s ours

am skip reason: Merged-In I0a21600eba986857e0231e02cb4d59fb108e9bd3 with SHA-1 51e888ba is already in history

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

Change-Id: I44a5d7c6c826f7b28979d34f0fd5c50f761ac085