Merge "Measure total time in state" am: 38effc4ffd am: 59146f7d22

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1538886

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d3d3e9d423386fd80eb67c1500e4c33ba3a8102