Merge "Test: Added Helper Abstract class for Settings Bug: 64801878 Change-Id: I1c018422110ee74183a82923af9d78b88016638f (cherry picked from commit 502015b2)" into oc-mr1-dev am: aaec526e Change-Id: I89040a81d0890eada0573d090e2e56850b9b7a10