am c6ffc840: am 270c099f: Merge "Move emulator check & save system properties access" into klp-modular-dev

* commit 'c6ffc840c4e34a61b537e1fc3e90b111d4150244':
  Move emulator check & save system properties access