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

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

Change-Id: Ie77e7d214896595856b0c490888d7c8926f35240