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

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

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



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