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