[automerger skipped] *common: use package as name am: 014e70b1ea am: 6f32e963b1 -s ours am: 3bcbe2aacc -s ours

am skip reason: Change-Id Ie1d92a50dddf7e3e1bd473e2a957279c6dadb865 with SHA-1 926aa80f04 is in history

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

Change-Id: Ic5f4e967d8be891b4bd84947fefb4bb8b366a5d8