Merge changes from topic 'selinux-targetSdkVersion'
am: fb6783391e

Change-Id: Ife6c83dc50c381fcb1e2765beda3d69a26101401