Merge "Allow the default SMS app to be blocked" into qt-dev am: aaecede217
am: f6578fc088
am: 9b6dd07073
Change-Id: Id93777a451998e8f264cd031386f49e38eb1bf6f
This commit is contained in: