[automerger skipped] Merge "Add CreateEmptyDevice and WaitForDevice APIs" into sc-v2-dev am: 83295cf4 -s ours

am skip reason: Merged-In I4dfa14e5271a6a13de6da73ec3c7efb1ebc0f8b8 with SHA-1 15e0f5a9 is already in history

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

Change-Id: If14b81da5064a7d7a4bbf03770883dfd7126735a