Merge "Do not reset roundness on ExpandableOutlineView.initDimens()" into tm-qpr-dev am: f37fea9336

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

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