Use the right executor for callbacks in Shell code

Bug: 181814254
Test: atest SystemUITests
Change-Id: I60a196360f9ff435ce99cb5e1d42d3da400d1206
2 files changed