Merge "Fix time-in-foreground to include PROCESS_STATE_FOREGROUND_SERVICE" into sc-dev am: 4113199752 am: 73fcaf480a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671229 Change-Id: Iba27360a4bce73a61319792ae71909512117cbdb
This commit is contained in: