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

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

Change-Id: I9a0560c58c5d9a3b09379cef90a41fd9b2a718d5