Merge "Fix androidboot.bootdevice test case for bootconfig" am: 34cf9834e4

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

Change-Id: I985184a8f0ec0543a131e1af328e5bfdd30fdb03