Merge "Remove unused variables" am: edab2ac359

Original change: https://android-review.googlesource.com/c/platform/development/+/2495416

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