[automerger skipped] Merge the module_* device.mk files into their...

[automerger skipped] Merge the module_* device.mk files into their corresponding product mk am: e118347e -s ours

am skip reason: skip tag Change-Id Ia312431a664e731f5d801ee2671f62f5cd23bd51 with SHA-1 4ca749cb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14199546

Change-Id: Ia3892c5b72b6bbd4371149bad00ec9ee9543adaf