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

Change-Id: I4b129c8759994fbac3ef2b4961cfd9273c7ef112