Merge "Restrict more properties to device-supported packages." into main am: f3cf19de5e

Original change: https://android-review.googlesource.com/c/platform/development/+/2772385

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