Merge "Fix device ordering" into sc-v2-dev am: f746e466dc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982067

Change-Id: Iee81abe5eaeae22c24b0d238793a572a0e5c2b23