[automerger skipped] Merge changes from topic "dynamicConfig" am: bc7cfe2b...

[automerger skipped] Merge changes from topic "dynamicConfig" am: bc7cfe2b am: 3be3b3d6 am: 6e707691 -s ours

am skip reason: skip tag Change-Id I2ab16fa9645dba07f8969e3cd7a26cf3b9bcb527 with SHA-1 32b6f9ea is already in history

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

Change-Id: Ibf2e080479f0fd604da45ed57b1b7b95293b9bf3