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

Change-Id: I8dc991e98cfcf73ca4a746750cd7d22cb7fde485