Merge "Merge "Check when trust agents do not declare a settings activity."...
Merge "Merge "Check when trust agents do not declare a settings activity." into qt-dev am: 782e511f am: 683224ee" into qt-r1-dev-plus-aosp
am: 43e86930
Change-Id: Ie63b69240802c8204c04c47d1e42f3e2cdde7174