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: I628ccce349df3a9f1ef5214eec5baef4f7968303