Merge "Merge changes from topic "jank-toggle" into tm-dev am: dfed7f9e am:...

Merge "Merge changes from topic "jank-toggle" into tm-dev am: dfed7f9e am: 623ab356 am: bad397b9" into tm-qpr-dev-plus-aosp am: 0639d400

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



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