Merge \\\"Return correct default theme on API >= 24\\\" into nyc-dev am: afaa1e9db1 am: 7fa09ec4dc
am: fffeae3b2c

Change-Id: I4599b8ffd9cf581d7418cc4c8cd8f63d66ef212c