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: e664dec81d am: 08e5913a73

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

Change-Id: I219694585d7436e52082f18d3d728ed6a71d6553