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

Merge "Import macro directly rather than using #[macro_use]." am: d30f8081 am: 9b495caa am: 805c23c8

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



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