Merge "Add Executors to Dependency" am: 40ecd434e4 am: 5565ad41ef

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

Change-Id: I458cb2d5130f949e5eab520b59c41f74495350ce