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