Merge "Fix LnT icon not being removed from dream status bar." into udc-qpr-dev am: e97c42cc

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



Change-Id: Iefaf984b31f7c7b4bdfd496e3e171b9265ba4086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>