Merge "Add a unit test for Android Runtime (Boot) device configuration flags." am: 6631e7c3a7
am: 3fc88350ef

Change-Id: I50ecd962360ab6dcf99014fe1271091d497d491a