Merge "Print number of frames" am: 152de539df am: 719caf8746

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2479215

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