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

Change-Id: I883917c1e4d5d0fc76ac0e3698317ccae46ff3d8