Merge SP1A.211205.008 am: 737b0c7201

Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/Scheduling/+/1930744

Change-Id: I1d5d3e1a31cbedd9584480b2e50d58d565399199