Merge "FileUtils: add method to get UUID of a volume" into cm-10.1

Change-Id: Ic90688f75afabc2dec39627e94baead795aec21a
Merge "Fix requery behaviour of MemoryCursor." into cm-10.1

Change-Id: Ia32d622f860918dff40ab0a31a178cd3df4e1d63
Merge "Settings: Specify notification types for QS quick pulldown check (1/2)" into jb4.2

Change-Id: I3933247fc8221871602864666cc528486cb1fe97
Frameworks: Specify notification types for Auto Hide statusbar (1/2)

Allows users to choose between "non-permanent only" and "all notifications" in the autohide
the statusbar when there are no notifications check.

- cleanup a bit
- reduce method and provider settings call

Change-Id: I1f793df1ab702e89cdfeee8faa915ff13a3cc782
Frameworks: take notification size into account + cleanup

take notification size as well into account for qs swipe down
feature due it can take effect if the user dismiss a non permanent
one during a permanent one is present. CM bug

as well cleanup redundant code

Change-Id: Ie90ea286719d4a883f717fd546efc59eeb5d4990
New Event: ACTION_NEW_OUTGOING_SMS

Change-Id: I2f88a9b2e7bd37689c6e6f787589a9f5b949d11c
Merge "Also backup profiles file via backup manager." into cm-10.1

Change-Id: Ic0561d05d2b7524132d168247cc1ae19977a1272
Fix derp
 Merge "Fixes for clang: PackageInfo is a class, not a struct. String16 is contained in the android namespace. Do not namespace prefix it within the android namespace. Explicitly specify which std classes are necessary to prevent ambiguous type errors. (map, set)" into cm-10.1

Change-Id: I3fa099adbe39a85ca6f7bab959d83fe0491935a7
Merge remote-tracking branch 'upstream/cr-main' into cr-main