Fix tapping HUNs with weather clock

This reverts another CL which attempted to fix touching the unlock
icon when the notification shelf was next to it. By restoring the
ordering in XML, this restores the proper touch hierarachy.

Fixes: 370270324

Flag: EXEMPT bugfix
(cherry picked from commit 0b558a93)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2261f88f1ade916d18582edc925e013ed66cce35)
Merged-In: I906da1cf5e5106ada355232941399efe7f1d3b14
Change-Id: I906da1cf5e5106ada355232941399efe7f1d3b14