Merge "Remove unused declaration." into tm-dev am: d0e15737ae

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

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