[automerger skipped] Merge "Fix build issues w/ jetpck drop" into main am:...

[automerger skipped] Merge "Fix build issues w/ jetpck drop" into main am: df19a793 am: fe0c5515 -s ours

am skip reason: Merged-In I809b0abef1a33d39082448f8d504ef54e0793da6 with SHA-1 4e6b43c8 is already in history

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



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