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