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

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

Change-Id: Ib2557d6089a5e15b5d7d1be6120fe020a73d0597