Minor post-merge cleanup.

Change-Id: Ic65ef882b61aa6506d21bbe41b9ac8473a950591
Frameworks_Base: ( input devices ) Add Armenian Eastern hardware keyboard layout

Change-Id: I04e640a740261bb082e703f53e7a7e126da61088
Merge "Minor post-merge cleanup." into cm-10.2
Revert "Reduce total number of background apps for low memory devices"

This reverts commit 82289c1ec2c3d1767b3baeb309a2044a2ad3d405.

Change-Id: Ic4ef44c9219030041a5436bab74fce9ce7c8879c
am: Allow more hidden apps on devices with lots of RAM

 * If more than 1.5GB is present, allow up to 40 hidden apps.
 * Number is somewhat arbitrary, but was found to work well on D2.
 * Also look at the sys.mem.max_hidden_apps value if given.

Change-Id: I2d3cf6e0dad1bc0b482cc37bf9c61ed2f2b4be51
Merge "Frameworks_Base: ( input devices ) Add Armenian Eastern hardware keyboard layout" into cm-10.2
Merge "Revert "Reduce total number of background apps for low memory devices"" into cm-10.2
Merge "am: Allow more hidden apps on devices with lots of RAM" into cm-10.2
Dialer AutoComplete: Bootstrap the onUpgrade for the SettingsProvider
to automagically create this setting and enable it by default.

PS2: Delete evil whitespace
PS3: Forgot to update the DB Version

Change-Id: I58eee488d1dee4941713d5cc4503f2f2861462d5
Merge branch 'cm-10.2' into martincz