Merge "Fix LooperStatsTest" am: e21c4d9536 am: c1e5437e4f

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

Change-Id: I9e9b7c5cfeb7d5f5c44242691e0151f693eacb72