Merge "Show traces when side fps is shown or hidden (with reasons)" into...

Merge "Show traces when side fps is shown or hidden (with reasons)" into tm-qpr-dev am: 55d247e9 am: 7894a96b

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



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