Merge "Add config to show an alert dialog for video charges"
am: 1451124f86

Change-Id: Idf89d421f3716dc00af97877d19d81445dd63f44