Merge "Fix cleaning up all unknown hal templates." into tm-qpr-dev am: 4813fb4a

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



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