DO NOT MERGE OMADM Trigger in *#*#INFO#*#* hidden menu.

Failed Treehugger automerge to master, will be cherry-picked to master
manually.

Bug:32874442
Change-Id: Ie64eb28671ec4afafd352d1f86b61c4ce1108338
4 files changed