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

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

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



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