Merge "Fix WCDMA Level Calculation for Default CC"
am: 3ada51469a

Change-Id: I7f5f0fca6c5b92a87d9ba276a48fdc00e919a490