Roll-forward of "Add bedstead dependency"

Bug: 327704045
Test: atest ConcurrentMultiUserTest

Change-Id: Ie8dbfd1f5fa4fbed6656bf144633e99bd9c9fbd3
2 files changed