Merge "Fix build issues w/ jetpck drop" into main am: df19a793ac

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

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