Merge "Fix issue #29506774: Foreground Service Can Avoid Notification Requirement" into nyc-mr1-dev
am: b008ff14ac

Change-Id: I23d4a012433e628c581d1ba0b8ae6d0b9cd6fbb5