Android 11.0.0 release 16
Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.R2.10.00.00.685.011' into rvc-d1-dev

 Conflicts:
	mm-core/src/registry_table.c
	mm-core/src/registry_table_android.c

Bug: 157858241
Change-Id: Icca28a1f692d24ac3efa6b0700b066d0fd46808e