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