Merge "[automerger skipped] Include runtime-module-sdk in the SDK build. am:...

Merge "[automerger skipped] Include runtime-module-sdk in the SDK build. am: 57029c07 am: ae5dbe07 am: 1577a3d7 -s ours" into rvc-qpr-dev-plus-aosp am: e51843e1 -s ours

am skip reason: Change-Id I39f9024205a198ef8ce19e2c70e3b9dced54add1 with SHA-1 6ee5f754 is in history

Change-Id: I5cba54ac4367f625cf677192399d56b6689c60fc