Merge "Remove target sdk level check in DecimalFormat's prefix/suffix setters" am: e7671ae5e0
am: 2a39c55561

Change-Id: I0a70e2a5fe4f0d0bf723291f8db2ec0b248b4306