Merge "Add two APIs in SettingsLibActivityEmbedding"