[automerger skipped] Merge "Unify the mismatch in the byte order of the address." into sc-dev am: e664dec81d -s ours am: dc964c4e52 -s ours
am skip reason: Merged-In I59a1b5538e4f3fea77a98cba2aa46649fc32ac6b with SHA-1 4d990467b2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15339447
Change-Id: Ie4fe34fc86fa3698e99d919ba0155e301063d952
This commit is contained in: