Merge "Using InteractionJankMonitor only in S+" into sc-dev am: 29a7cd05d0 am: eedc3d2b49
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986721 Change-Id: Ia321235b3c4ba30e30cbe2e16f9a967b30393421
This commit is contained in: