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

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



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