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: fbaa63b5 am: 4db8560f" into rvc-qpr-dev-plus-aosp am: 3a9cf7a9

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

Change-Id: I67c8771bf09f97e890e227695450102c3eb6d4ba