[automerger skipped] Merge "Mark modules frozen explicitly." am: 11fa86bbb4 am: a4eefbe687 am: 1df03b9d8b -s ours

am skip reason: Merged-In Ica76a8225fec8dc5267362cbfd43e06e65ad3f1e with SHA-1 edff13e314 is already in history

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

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