Merge "Merge "Add support for LoggingOnly changes" into rvc-dev am: e9e7d56cd9 am: 8b676fa9e5" into rvc-d1-dev-plus-aosp am: 3dd73dfc35 am: 4687c5234a

Change-Id: I81d666e5b2509f3ce1f25d559b86ea11798d90ed