Merge "Change comments for numActiveSlots" am: 92f6d9a5b3 am: 5fd5c38b57 am: ab170531de am: c18ccc55c3

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2221127

Change-Id: I2f6d54b6403c2850bfc8e530b284f7fbab71bb27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>