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 am: ad1bc9aa

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



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