Merge "Make cuj be synchrous among atoms.proto and InteractionJankMonitor"...

Merge "Make cuj be synchrous among atoms.proto and InteractionJankMonitor" into tm-dev am: 6298c68c am: b728130f am: 49965272

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



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