Merge "Add a new carrier config to suppress AoC indication" am: db95dff0d8
am: c04d233ac2

Change-Id: Ic98c8f09bee42d8dba02c512b5543fb764105a92