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: a2a2a817 am: f5534a47

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



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