[automerger skipped] Merge "Unify the mismatch in the byte order of the...

[automerger skipped] Merge "Unify the mismatch in the byte order of the address." into sc-dev am: e664dec81d -s ours

am skip reason: Merged-In I59a1b5538e4f3fea77a98cba2aa46649fc32ac6b with SHA-1 1f29a9b3 is already in history

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

Change-Id: I07aa729fd9154e61a37ccd815ac29bc9f9e0f555