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

Change-Id: I5bc23ab43b2e6eda03cb0224fa9b2da59a9eda05