[automerger skipped] Merge "Fix cleaning up all unknown hal templates." into...

[automerger skipped] Merge "Fix cleaning up all unknown hal templates." into tm-qpr-dev am: 4813fb4a am: a4b38bd5 -s ours

am skip reason: Merged-In Ic45301ab15dd83cdd946411e5b0b227f843602cb with SHA-1 1497ec55 is already in history

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



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