Use @ConnectionPolicy annotation more consistently in classes with
methods setConnectionPolicy and getConnectionPolicy

Bug: 147669289
Test: Manual
Change-Id: I2b9b0391a02d01623c1cd253f2da12b2baaea599
7 files changed