Merge "Mark modules frozen explicitly." am: 11fa86bbb4 am: a4eefbe687

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

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