Merge "Create a metrics events for ag/2085657 (DO disclosure screens)" into oc-dev
am: 28f9ada2ac

Change-Id: Id024cab7c0edc1ebf8626f671ac281f68d71e86f