Merge "Track core platform API change" am: 1d45573eb2 am: 83d7191a22

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

Change-Id: I7cb7175a827aae27836324e0865c9a6d5ff6b5ed