Merge "Inline NO_SORT_BY_INTERRUPTIVENESS" into udc-qpr-dev am: 14ec5e1a81 am: a7b3fcc7b7

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

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