Merge "Enable touch feedback settings when the phone is in silent mode" into...

Merge "Enable touch feedback settings when the phone is in silent mode" into tm-dev am: f73af73a am: d16c71ad

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16980963

Change-Id: I13cc8e55760475ba4f3ee870160c465133414dfe