Merge "Merge "Optionally append managed service approvals" into oc-dr1-dev am: 445a6d42ef  -s ours am: fd2587ee7f  -s ours" into oc-mr1-dev-plus-aosp