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

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

Change-Id: I8b6d2be7809e82a3e655d91404c1c86548761b3c