Merge "Change API name" am: a0642974a4 am: f9d1535640 am: a14b3c6be2

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

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