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

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

Change-Id: Icc56d74b371e8e6a01d99ab71aaef86b5336e160