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