Merge "Makefile: Avoid packaging pvmfw.bin in /system" into main am:...

Merge "Makefile: Avoid packaging pvmfw.bin in /system" into main am: 66f7958f am: 3aca2727 am: a10ba13a am: 3de927e7

Original change: https://android-review.googlesource.com/c/platform/build/+/2687888



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