[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: e664dec8 -s ours am: dc964c4e -s ours am: 177279f3 -s ours

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

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

Change-Id: I07a8c8b30bdf5cf9a520009c85646804201cba4f