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

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

Change-Id: I5395890b81cb56d7d8db63fcf1b1b1485f0d4aee