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

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

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