Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
am: fc1753d495

Change-Id: I5cd92b3e08e812f6634f7a8c793b8ac9ef3bcc00