[automerger skipped] Merge "DO NOT MERGE Remove unused code" into tm-dev am: e15d10f3 am: 5742b664 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0536f7fa6f3da7ed72ecd5fc3662648252da8b1d