[automerger skipped] Remove some no longer used compaction variables am:...

[automerger skipped] Remove some no longer used compaction variables am: 3d961ed7 am: 6e1536a2 -s ours

am skip reason: Merged-In Ifb4e69857b7a0a2ef0d9d40b05de377b5be2788b with SHA-1 3d961ed7 is already in history

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



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