Merge "Merge "Color of the ring around the lock icon" into oc-dr1-dev am:...
Merge "Merge "Color of the ring around the lock icon" into oc-dr1-dev am: 0903e31e" into oc-dr1-dev-plus-aosp
am: e48ecd63
Change-Id: Ib76a130e4dc2d3c157d02cdfea849f1da1bfa352