Merge "Merge "Added null checks to LayerDrawable implementation" into qt-dev am: 6e4e9817b8 am: de05111e3e" into qt-r1-dev-plus-aosp
am: 1411c5e6b8

Change-Id: I7a5bfa8865d77f580033deb682a29ab4652bcbb9