Merge "Tweak dialog layout of EditTextPreference" into tm-dev am: 13c6ef8e am: 159cdc0c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17369586



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