Merge "Import macro directly rather than using #[macro_use]." am: d30f808195 am: 9b495caabc

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2392889

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