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