Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev am: e99f20df58 am: c76250cd50

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

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