Merge "Updated 'Utils.cpp' and 'HevcUtils.cpp'" am: 1f88b099d4 am: 933cbc51ec am: 42b7f25cef

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

Change-Id: If264890c7d3117fa5ec62d6b2bab2e981733efa1