Merge "Merge "Work on issue #36891897: Need to ensure foreground services..." into oc-dev am: ef0554438f am: 92cc8d3816" into oc-dr1-dev-plus-aosp