temp Revert "Correct the lockscreen carrier text alignment and text color"

This reverts commit b2ee13cebfff1cff2786c448f91777c0eef1e27c.
temp Revert "SystemUI: kill MSim logspew"

This reverts commit 816f47c258a97f86506d61eea9546755d02df7fc.
temp Revert "make switch to last app animation snappier"

This reverts commit 0c1aaf0bffdc6860523f0537b38a18d28d4bb44a.
temp Revert "KeyGuard: fixed strings warnings"

This reverts commit 20dda3432f7402d50cefc8b34d0adb952742856d.
Revert "core: Fix typos in AOSP EN resources"

This reverts commit 50b2e288ffee0782fd151f515031e31bc0cfa435.
Revert "Forward port battery icon options [1/2]"

This reverts commit aca695a9d1059847b21593667e3f4248ee375161.

Conflicts:
	core/java/android/provider/Settings.java
Revert "[Base]: recents panel clear all button tweaks"

This reverts commit 18383cf1dfc10fdb208d918be5231e5fa384d367.

Conflicts:
	core/java/android/provider/Settings.java
Revert "SystemUI: fix MediaProjection cast crash"

This reverts commit e4af8b7a82396bbd4459e499a95afb06d9d37b0a.
Revert "SystemUI: fix battery icon patch for MSim"

This reverts commit c17d38dfdd04b9d61b3c580ffbf844e4331234cf.