[automerger skipped] Merge "Remove concept of nits from the client target...

[automerger skipped] Merge "Remove concept of nits from the client target properties" into tm-dev am: ca18b966 -s ours

am skip reason: Merged-In I1be65f7c511fefa239305e0735637126a1cd6622 with SHA-1 bf0bbc2d is already in history

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

Change-Id: I831df60857c0ee1fc56a3262735130f64306b156