Merge "Remove unused variables" am: edab2ac359 am: 1f481b6f2f

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

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