Merge "frameworks/base: Addition of Changes for ZeroBalance feature"