Merge "Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce -s ours am: a59e02fd58" into oc-dr1-dev-plus-aosp
am: 41a66cccc1 -s ours
Change-Id: I164ec412f672c397ec5dc79077690e2ec57a960f
This commit is contained in: