Merge "Use hasScrollAction in ApnEditPageProviderTest" into main am: 12f2e1cf4f

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3283218

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