Merge "Add Nullable annotation to getDecorView" am: a018254b45
am: b812cec859

Change-Id: I13b43231caaca17dfa3f67c9d77c0792a77f6e3b