Merge "Merge "Optionally append managed service approvals" into oc-mr1-dev am: d87e79aae6" into oc-mr1-dev-plus-aosp