Merge "Merge "Change API name" am: a0642974 am: f9d15356 am: a14b3c6b"...

Merge "Merge "Change API name" am: a0642974 am: f9d15356 am: a14b3c6b" into udc-dev am: 3e158cd4

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



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