[automerger skipped] Deflake libdm#CreateEmptyDevice test am: 654bb5225b -s ours am: 4d7b4f680b -s ours

am skip reason: Merged-In I8a74375631b20c14a32a41dbaf38380ebc0078e6 with SHA-1 7756779289 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/16561671

Change-Id: I7f327490b80caefaebf607393bbefee7cb9c62ec