Merge "Remove unused scaffolding for partial shelf overflow" into tm-qpr-dev...

Merge "Remove unused scaffolding for partial shelf overflow" into tm-qpr-dev am: 254acc56 am: b1062f1a

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



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