Merge "Merge "Make cuj be synchrous among atoms.proto and InteractionJankMonitor" into tm-dev am: 6298c68c am: b728130f" into tm-d1-dev-plus-aosp am: 3e1e5a7b

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



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