Merge "Implements the buttons layout for the extra defend" into tm-qpr-dev am:...

Merge "Implements the buttons layout for the extra defend" into tm-qpr-dev am: aa326285 am: 939f2a9e

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



Change-Id: I582c5cc6df9b9454013b4435d261c336fc4e7a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>