[automerger skipped] Merge "Add a unit test for Android Runtime (Boot) device configuration flags." am: 6631e7c3a7 am: 3fc88350ef
am: ab33fcea7a -s ours
am skip reason: change_id I6cf43c3ee0d405fb1b69a450587dd712f911358d with SHA1 0645bcb843 is in history

Change-Id: Ic210b4344e71022e07159abd66be9c4b6670d815