Merge "Add Executors to Dependency" am: 40ecd434e4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1437251

Change-Id: I763a209a732e85b8361c499f6fb314526289bfff