Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev