Automatic translation import

Change-Id: I7d0558e52d0fe54b2dc5df11201b7bb128407a6a
frameworks: fix setting default ringtone for multi sim

The defualt value for the ringtone expects a "_" between the setting and
the requested sim subscription. This was not being respected in the
mediascanner when it set the default ringtones, resulting in the setting
value being "ringtone2" instead of "ringtone_2".

Change-Id: I4a9147d579183229cc3300e71194e6f5ab74fbc6
Signed-off-by: Roman Birg <roman@cyngn.com>
WallpaperCropper: do crop!

Change-Id: I2a9571e8648b168e370bf4244bd28d0a65650572
Revert "WallpaperCropper: do crop!"

Lets revisit this for just devices who need this

This reverts commit d238c274e29677a17db82151924828ea7701d852.

Change-Id: I4b91d29f434670f99e05092fa653124fbe72ef70
Merge remote-tracking branch 'upstream/android-4.4' into android-4.4