Merge "Fix performance regressions" into tm-qpr-dev am: e8b7907312 am: fb11299fc8

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

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