Merge "[framework] Pass in package name when change reader option." into main am: 4cc8f565a2

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

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