[automerger skipped] Merge "Change default units to be consistent in tm-qpr-dev/DefaultConfig.h" into tm-qpr-dev am: 53cb2459e8 am: 1d7be47b7b -s ours

am skip reason: Merged-In Ib159f781f61de8a7cd1498ad2a07e5dbd0eca734 with SHA-1 848fcb49b4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/20814765

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