Merge "Merge "SF: avoid updating queue if schedule() is called." into rvc-dev...

Merge "Merge "SF: avoid updating queue if schedule() is called." into rvc-dev am: 0bc7c529 am: d61f23ec am: 583a628c" into rvc-qpr-dev-plus-aosp am: 707f7be2

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

Change-Id: I1180ebf770a5afe02a0563cd4293e0112c2104e8