Merge changes from topic "Video Enc Stats for T" am: c073b57416 am: 3b60dba533 am: f092f4909f

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

Change-Id: Ib694bad364fef568c040f49f0e00af6fecad1a2b