Merge "Add key for teletext magazine and page number" am: 94618f06 am: fdf5d601 am: f9197f7c

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



Change-Id: I9e29027a512758a8a3c511022d5ea2b61bd30e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>