Merge "Updated 'Utils.cpp' and 'HevcUtils.cpp'" am: 1f88b099d4

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1323879

Change-Id: I5f08c0546073dc8ea74a3383ea01143e08e87044