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

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



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