am 0888a067: Merge "Fix AudioFocus for back-to-back notifications"

# Via Android (Google) Code Review (1) and Jean-Michel Trivi (1)
* commit '0888a06762fb55d48646c86c6a0184a0b96cdc24':
  Fix AudioFocus for back-to-back notifications