Merge "Add property to skip idle state for zram writeback" am: a594a9e68c
am: 376ca93cb2

Change-Id: I78183b91ac536a4c599b8dde1a097109612914a6