Merge "enc stat: Add feauture and its keys to MediaCodec" am: 93f84575c3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891583

Change-Id: Ib559cfdba74876b06ba7582991228a7ebe6cc802