Merge "Remove unused declaration." into tm-dev am: d0e15737 am: 398b5558

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



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