Merge "Fixed latency spike" into tm-qpr-dev am: 8f775f2a9f am: 9a48d41b1d

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

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