[automerger skipped] Merge "Add the feature tags for the pager mode, larege...

[automerger skipped] Merge "Add the feature tags for the pager mode, larege message mode, deffered messaging and large-pager mode." am: fe011e06 am: 6436a282 am: 38961854 -s ours

am skip reason: Merged-In I2057c1a74e3db12d34b726c0cba7dfc26601bee5 with SHA-1 bf214e3d is already in history

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



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