Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022 Change-Id: Ibcf50a295606d3e3b03dead22a1f4423cafb1e45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>