Merge "Fix SELinuxHostTest#testNetdDomain failure" am: 31fab96251 am: 6839f8e576
am: 307432fde7

Change-Id: I03e8c713eaa246b653be3dd950e2c13120edef28