Merge commit 'bd10777948fe5a0d9452f73c30941f46c6b4a2bf' into HEAD

* commit 'bd10777948fe5a0d9452f73c30941f46c6b4a2bf':
  Forward package removed broadcast to KeyChainService

Test: make full -j30
Fix: 36568026
Change-Id: Icd3cda64e403212132e2c7d731e9793eb92c368a