Merge "Revert "More robust updating of "runnable" list."" into udc-dev am: 5b7d07f5 am: ca218fe8

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



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