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

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



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