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