Merge "Fix -Wunused-variable compiler warning" into main am: e6d39e67

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2859205



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