Fix issue #29506774: Foreground Service Can Avoid Notification Requirement am: 0ba4c710c6
am: e1315924f1

Change-Id: I67d77792716287073352cb9f50a7f192f8f3fc90