Merge "Make available to com.android.compos apex"