Merge changes from topic "jank-toggle" into tm-dev am: dfed7f9e am: 623ab356 am: bad397b9

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



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