Merge "Merge "Reorder notification settings" into qt-dev am: 1abcbaa093
am: 53bbf9b78d" into qt-r1-dev-plus-aosp
am: 409d8687d1
Change-Id: Idca81960cd2b22246afe4d197d906b69ab69699c
This commit is contained in: