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: 23ee4f93" into qt-r1-dev-plus-aosp
am: 5a365379
Change-Id: I17b66525afa3a6d7f536827b2f9ed0c507a13e8c