Merge "Adding test for reader compatibility" into main am: 4b3b6e2ff5 am: 4cda9ec9bb am: 5c3edb098a am: c7a74d64f8 am: 5a528ef7a7

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762279

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