Merge "Unify the mismatch in the byte order of the address." into sc-dev am:...

Merge "Unify the mismatch in the byte order of the address." into sc-dev am: e664dec8 am: 90060aa8

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

Change-Id: Icac5788bc453ac6b81af9ce01ac204fd727b1618