Merge "Adding test for reader compatibility" into main am: 4b3b6e2f am:...

Merge "Adding test for reader compatibility" into main am: 4b3b6e2f am: 4cda9ec9 am: 5c3edb09 am: c7a74d64

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



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