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