[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 -s ours am: 90bf7b7a -s ours am: a0efe929 -s ours

am skip reason: Merged-In I0a21600eba986857e0231e02cb4d59fb108e9bd3 with SHA-1 23ea9da2 is already in history

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

Change-Id: Ie65f48a102487154872ea135f84850d5a710d727