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

Change-Id: I40a99988b92ae14c3a0bb936358fce98addca06d