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 am: 6c0a5735

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



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