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