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

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

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