Merge "Prefer Executor injection" into tm-qpr-dev am: 11a70366c8

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

Change-Id: I09ee64a6e3ec05a84782b875d8262c2ee84dc817
Signed-off-by: Automerger Merge Worker <[email protected]>