Merge "Inject getS2rS2dConfig through constructor." into main am: f74d99117c

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3267579

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