sony: merge 11.0.A.7.5 release

Change-Id: I7c123e192119a2b5cd45977c4513f53602984162
usb: force 500Ma charging current on unknown chargers

Change-Id: I935358ae3f7edae1644de0c937f20efdab22f8c4