Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_frameworks_base into cm-12.0

27be12bc22abdfae9e6cefec503c81300c75ef56
552943ca153aec19ab8598f1fe4e419718744e51
552943ca153aec19ab8598f1fe4e419718744e51
3e31f300bbc0152ee065725daa79ed937ea91e7c
03c4e7fa3fdace6760cbd72274baaa1cb19cfe2c
99c2a065e3dfe67e5de0bbfe47601d1c2974c450
41990ea1599382b7edf69fa2de8bea180393fe41
bc68e96f0511753c53046beaeb5c0af4b6d520fc
14527e0dba352ec497ea72f14d942c88a5358a27
0de7eca52a141d830d68cfb6acb64adef5f7e57b
9dfed682a9bb552f6b9657dec0ac03e39fc3ab55
87b6e6bf9018c600c03c82896938701e13c9ae04
18f8d50af1845930585f81acbe40b4036843ce86
1ebad9370c3ff6e9ba4ae8ce6fd487ad091aa667
dfca28ba2124f465bba74adda22f4e4dc1b1edc7
4cb165d04c28cef149b07bb460710508411c229a
28fc6d778ea7ac58da319cebf2324ba4ea6b96cf
f1602db4c98ff0208258c933d3ce35974d3f4b29
72fa3c3b4bea12183a62374e2684909684e0241f
c1bec36cd07f893965f72d284e7483bd3be73dca
00c2018e7d8d7a5fe2767d5f57f1c23f4104e51c
c7a4aa7d96d236835b187c72a82d7e6bf1231c3a
86f21d14d8afd1c991f7c35184971616b36d8131
fc8c502d005719435b34eb1995e3ad4380312fee
16e8c7237baccccc3f83ed024676bbfbbbc3cc53
cb2a65970f26cac6f47518e53894a497f4bb2278
30e6747f9bb951103bd1cb185db10846a8645a06
46eb2c5e27bd9d7ca56921ac132479625e51c00c
4018ce82bb5c3a7684d1e48cf9516e188b140f56
847b02e05d5901860a772c49c7f39c5231aede4d
f64a468b12e8c651f6ec8a583633d036932440f9
539bc6197e1406338ef9254dad0da5efa48c1f82
4daf28faee922853c91385356bfbc2c53ac5c6cf
7a9c11f4396c07e1d6fd5e5913f4b8e500a9555e
33a9b650065dfd81e2a2f4540254177ef9b3bd5a
4f77a4140afd9fa9269874a73b3f760fa5cc393b
1f13a6939e4e1e75ebe7f920636b566e4dbe5c41
4e302a665da2643044852c383bcdb3f9e2fd4915
30def9e7fac025f68c540492be9be8bdd2afda5a
5c25d5cc0aeed43bca506edc179fd2bb12a1766c