Merge branch 'lineage-16.0' of github.com:LineageOS/android_device_moto_shamu into HEAD

Change-Id: Ic943be37068c8ef66bdc7614b72d6cd1ab0283b3