Merge "Clean up most Shade package warnings" into tm-qpr-dev am: d2194850 am: 8c496e60

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



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