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

Change-Id: I5d8a7dafb0b3938324df494ee49c644a47ef6d96