Merge changes from topic "jank-toggle" into tm-dev am: dfed7f9e2f am: 623ab35698 am: 6b8d237d6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18195532 Change-Id: I22ccd11fce48caf803c99b45b0a1cac618cb7c35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: