Merge "Actually use the passed-in executor for unused count" into tm-dev am: 869e4d4f

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



Change-Id: Ia9455693a7350ed7b13280dec697b293306156d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>