Merge "Update Prevent Ringing setting to avoid conflict with long press power" into sc-dev am: 1d2371eecd am: ada2302bd6 am: 875aba5a82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175451 Change-Id: I2cff5c28da9e5c5caa3fb0091fb06318aaf39e1d
This commit is contained in: