Merge "Merge "Adjust queue for test jobs." into tm-dev am: 172a02ec" into tm-mainline-prod am: c52721a0

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

Change-Id: I6939f2b1ecd6781a4ccf615ea752af5b0a112f0b
Signed-off-by: Automerger Merge Worker