Merge "Final icons in dream overlay status bar." into tm-dev am: 2e60d413 am: fa653c62

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943443

Change-Id: Ib6168131e9039f14ef2a0f624940eb62d1f6acc0