Merge "don't log auto-expansion of notificaitons" into oc-mr1-dev
am: 0f016f00c4

Change-Id: I958d991156c765c3283d279165aa5944c0e8c424