Merge "sepolicies for sys prop enabling flag health check" am: 745d3839e4
am: cc75f78ca9

Change-Id: I11b026616f7cc54de071efcb816db3af0b659ae9