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

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

Change-Id: I5f962a21920708e2f5747466d943a5a5e35414db